diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6d74d5509..d498acc5d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
+            android:name=".activities.MainActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -22,11 +22,11 @@
         </activity>
 
         <activity
-            android:name=".PhotosActivity"
+            android:name=".activities.PhotosActivity"
             android:screenOrientation="portrait"/>
 
         <activity
-            android:name=".PhotoActivity"
+            android:name=".activities.PhotoActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
     </application>
diff --git a/app/src/main/java/gallery/simplemobiletools/com/MainActivity.java b/app/src/main/java/gallery/simplemobiletools/com/activities/MainActivity.java
similarity index 91%
rename from app/src/main/java/gallery/simplemobiletools/com/MainActivity.java
rename to app/src/main/java/gallery/simplemobiletools/com/activities/MainActivity.java
index 219cf6f79..c16a64abe 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/MainActivity.java
+++ b/app/src/main/java/gallery/simplemobiletools/com/activities/MainActivity.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package gallery.simplemobiletools.com.activities;
 
 import android.content.Intent;
 import android.database.Cursor;
@@ -17,6 +17,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import gallery.simplemobiletools.com.Constants;
+import gallery.simplemobiletools.com.Directory;
+import gallery.simplemobiletools.com.R;
+import gallery.simplemobiletools.com.adapters.DirectoryAdapter;
+
 public class MainActivity extends AppCompatActivity implements OnItemClickListener {
     private List<Directory> dirs;
 
diff --git a/app/src/main/java/gallery/simplemobiletools/com/PhotoActivity.java b/app/src/main/java/gallery/simplemobiletools/com/activities/PhotoActivity.java
similarity index 90%
rename from app/src/main/java/gallery/simplemobiletools/com/PhotoActivity.java
rename to app/src/main/java/gallery/simplemobiletools/com/activities/PhotoActivity.java
index 9c5dc849b..753cd484f 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/PhotoActivity.java
+++ b/app/src/main/java/gallery/simplemobiletools/com/activities/PhotoActivity.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package gallery.simplemobiletools.com.activities;
 
 import android.database.Cursor;
 import android.net.Uri;
@@ -11,6 +11,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import gallery.simplemobiletools.com.Constants;
+import gallery.simplemobiletools.com.R;
+import gallery.simplemobiletools.com.adapters.MyPagerAdapter;
+
 public class PhotoActivity extends AppCompatActivity {
     private int pos;
 
diff --git a/app/src/main/java/gallery/simplemobiletools/com/PhotosActivity.java b/app/src/main/java/gallery/simplemobiletools/com/activities/PhotosActivity.java
similarity index 90%
rename from app/src/main/java/gallery/simplemobiletools/com/PhotosActivity.java
rename to app/src/main/java/gallery/simplemobiletools/com/activities/PhotosActivity.java
index aff7ea72e..a3b988557 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/PhotosActivity.java
+++ b/app/src/main/java/gallery/simplemobiletools/com/activities/PhotosActivity.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package gallery.simplemobiletools.com.activities;
 
 import android.content.Intent;
 import android.database.Cursor;
@@ -13,6 +13,10 @@ import android.widget.GridView;
 import java.util.ArrayList;
 import java.util.List;
 
+import gallery.simplemobiletools.com.Constants;
+import gallery.simplemobiletools.com.R;
+import gallery.simplemobiletools.com.adapters.PhotosAdapter;
+
 public class PhotosActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
     private List<String> photos;
 
diff --git a/app/src/main/java/gallery/simplemobiletools/com/DirectoryAdapter.java b/app/src/main/java/gallery/simplemobiletools/com/adapters/DirectoryAdapter.java
similarity index 93%
rename from app/src/main/java/gallery/simplemobiletools/com/DirectoryAdapter.java
rename to app/src/main/java/gallery/simplemobiletools/com/adapters/DirectoryAdapter.java
index fa2c32ef6..40d597f41 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/DirectoryAdapter.java
+++ b/app/src/main/java/gallery/simplemobiletools/com/adapters/DirectoryAdapter.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package gallery.simplemobiletools.com.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -12,6 +12,9 @@ import com.bumptech.glide.Glide;
 
 import java.util.List;
 
+import gallery.simplemobiletools.com.Directory;
+import gallery.simplemobiletools.com.R;
+
 public class DirectoryAdapter extends BaseAdapter {
     private final Context context;
     private final List<Directory> dirs;
diff --git a/app/src/main/java/gallery/simplemobiletools/com/MyPagerAdapter.java b/app/src/main/java/gallery/simplemobiletools/com/adapters/MyPagerAdapter.java
similarity index 94%
rename from app/src/main/java/gallery/simplemobiletools/com/MyPagerAdapter.java
rename to app/src/main/java/gallery/simplemobiletools/com/adapters/MyPagerAdapter.java
index c6ee8b644..f22f4a7ab 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/MyPagerAdapter.java
+++ b/app/src/main/java/gallery/simplemobiletools/com/adapters/MyPagerAdapter.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package gallery.simplemobiletools.com.adapters;
 
 import android.content.Context;
 import android.support.v4.view.PagerAdapter;
@@ -11,6 +11,8 @@ import com.bumptech.glide.Glide;
 
 import java.util.List;
 
+import gallery.simplemobiletools.com.R;
+
 public class MyPagerAdapter extends PagerAdapter {
     private final Context context;
     private final List<String> paths;
diff --git a/app/src/main/java/gallery/simplemobiletools/com/PhotosAdapter.java b/app/src/main/java/gallery/simplemobiletools/com/adapters/PhotosAdapter.java
similarity index 94%
rename from app/src/main/java/gallery/simplemobiletools/com/PhotosAdapter.java
rename to app/src/main/java/gallery/simplemobiletools/com/adapters/PhotosAdapter.java
index 2572a1109..0c9ca31d4 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/PhotosAdapter.java
+++ b/app/src/main/java/gallery/simplemobiletools/com/adapters/PhotosAdapter.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package gallery.simplemobiletools.com.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -11,6 +11,8 @@ import com.bumptech.glide.Glide;
 
 import java.util.List;
 
+import gallery.simplemobiletools.com.R;
+
 public class PhotosAdapter extends BaseAdapter {
     private final Context context;
     private final List<String> photos;