diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
index 9f7e27bc9..6159f5b44 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
@@ -30,7 +30,7 @@ import android.widget.GridView;
 import android.widget.Toast;
 
 import com.simplemobiletools.gallery.Constants;
-import com.simplemobiletools.gallery.Directory;
+import com.simplemobiletools.gallery.models.Directory;
 import com.simplemobiletools.gallery.R;
 import com.simplemobiletools.gallery.Utils;
 import com.simplemobiletools.gallery.adapters.DirectoryAdapter;
diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/MediaActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/MediaActivity.java
index ecfcdd1fd..e83685d41 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/activities/MediaActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MediaActivity.java
@@ -28,7 +28,7 @@ import android.widget.GridView;
 import android.widget.Toast;
 
 import com.simplemobiletools.gallery.Constants;
-import com.simplemobiletools.gallery.Medium;
+import com.simplemobiletools.gallery.models.Medium;
 import com.simplemobiletools.gallery.R;
 import com.simplemobiletools.gallery.Utils;
 import com.simplemobiletools.gallery.adapters.MediaAdapter;
diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
index 68ab1cedf..6ecba0151 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
@@ -20,7 +20,7 @@ import android.widget.EditText;
 import android.widget.RelativeLayout;
 
 import com.simplemobiletools.gallery.Constants;
-import com.simplemobiletools.gallery.Medium;
+import com.simplemobiletools.gallery.models.Medium;
 import com.simplemobiletools.gallery.MyViewPager;
 import com.simplemobiletools.gallery.R;
 import com.simplemobiletools.gallery.Utils;
@@ -43,11 +43,11 @@ public class ViewPagerActivity extends AppCompatActivity
 
     private int pos;
     private boolean isFullScreen;
+    private boolean isUndoShown;
     private ActionBar actionbar;
     private List<Medium> media;
     private String path;
     private String directory;
-    private boolean isUndoShown;
     private String toBeDeleted;
     private String beingDeleted;
 
diff --git a/app/src/main/java/com/simplemobiletools/gallery/adapters/DirectoryAdapter.java b/app/src/main/java/com/simplemobiletools/gallery/adapters/DirectoryAdapter.java
index cd763cddd..bd9619805 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/adapters/DirectoryAdapter.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/adapters/DirectoryAdapter.java
@@ -9,7 +9,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.simplemobiletools.gallery.Directory;
+import com.simplemobiletools.gallery.models.Directory;
 import com.simplemobiletools.gallery.R;
 
 import java.util.List;
diff --git a/app/src/main/java/com/simplemobiletools/gallery/adapters/MediaAdapter.java b/app/src/main/java/com/simplemobiletools/gallery/adapters/MediaAdapter.java
index 4da66bd2b..0dfa05b1e 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/adapters/MediaAdapter.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/adapters/MediaAdapter.java
@@ -8,7 +8,7 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
-import com.simplemobiletools.gallery.Medium;
+import com.simplemobiletools.gallery.models.Medium;
 import com.simplemobiletools.gallery.R;
 
 import java.util.List;
diff --git a/app/src/main/java/com/simplemobiletools/gallery/adapters/MyPagerAdapter.java b/app/src/main/java/com/simplemobiletools/gallery/adapters/MyPagerAdapter.java
index 883120b8d..c303ca59f 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/adapters/MyPagerAdapter.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/adapters/MyPagerAdapter.java
@@ -6,10 +6,10 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 
 import com.simplemobiletools.gallery.Constants;
-import com.simplemobiletools.gallery.Medium;
-import com.simplemobiletools.gallery.PhotoFragment;
-import com.simplemobiletools.gallery.VideoFragment;
-import com.simplemobiletools.gallery.ViewPagerFragment;
+import com.simplemobiletools.gallery.models.Medium;
+import com.simplemobiletools.gallery.fragments.PhotoFragment;
+import com.simplemobiletools.gallery.fragments.VideoFragment;
+import com.simplemobiletools.gallery.fragments.ViewPagerFragment;
 
 import java.util.List;
 
diff --git a/app/src/main/java/com/simplemobiletools/gallery/PhotoFragment.java b/app/src/main/java/com/simplemobiletools/gallery/fragments/PhotoFragment.java
similarity index 88%
rename from app/src/main/java/com/simplemobiletools/gallery/PhotoFragment.java
rename to app/src/main/java/com/simplemobiletools/gallery/fragments/PhotoFragment.java
index d8325d5fe..ba7a43d62 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/PhotoFragment.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/fragments/PhotoFragment.java
@@ -1,4 +1,4 @@
-package com.simplemobiletools.gallery;
+package com.simplemobiletools.gallery.fragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -7,6 +7,9 @@ import android.view.ViewGroup;
 
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
+import com.simplemobiletools.gallery.Constants;
+import com.simplemobiletools.gallery.models.Medium;
+import com.simplemobiletools.gallery.R;
 import com.simplemobiletools.gallery.activities.ViewPagerActivity;
 
 public class PhotoFragment extends ViewPagerFragment implements View.OnClickListener {
diff --git a/app/src/main/java/com/simplemobiletools/gallery/VideoFragment.java b/app/src/main/java/com/simplemobiletools/gallery/fragments/VideoFragment.java
similarity index 97%
rename from app/src/main/java/com/simplemobiletools/gallery/VideoFragment.java
rename to app/src/main/java/com/simplemobiletools/gallery/fragments/VideoFragment.java
index 3286cc976..c98da36b1 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/VideoFragment.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/fragments/VideoFragment.java
@@ -1,4 +1,4 @@
-package com.simplemobiletools.gallery;
+package com.simplemobiletools.gallery.fragments;
 
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -18,7 +18,11 @@ import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import com.simplemobiletools.gallery.Constants;
+import com.simplemobiletools.gallery.R;
+import com.simplemobiletools.gallery.Utils;
 import com.simplemobiletools.gallery.activities.ViewPagerActivity;
+import com.simplemobiletools.gallery.models.Medium;
 
 import java.io.IOException;
 import java.util.Locale;
diff --git a/app/src/main/java/com/simplemobiletools/gallery/ViewPagerFragment.java b/app/src/main/java/com/simplemobiletools/gallery/fragments/ViewPagerFragment.java
similarity index 79%
rename from app/src/main/java/com/simplemobiletools/gallery/ViewPagerFragment.java
rename to app/src/main/java/com/simplemobiletools/gallery/fragments/ViewPagerFragment.java
index f59eb08ee..b16ee5525 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/ViewPagerFragment.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/fragments/ViewPagerFragment.java
@@ -1,4 +1,4 @@
-package com.simplemobiletools.gallery;
+package com.simplemobiletools.gallery.fragments;
 
 import android.support.v4.app.Fragment;
 
diff --git a/app/src/main/java/com/simplemobiletools/gallery/Directory.java b/app/src/main/java/com/simplemobiletools/gallery/models/Directory.java
similarity index 93%
rename from app/src/main/java/com/simplemobiletools/gallery/Directory.java
rename to app/src/main/java/com/simplemobiletools/gallery/models/Directory.java
index b8198cc47..ada17568f 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/Directory.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/models/Directory.java
@@ -1,4 +1,4 @@
-package com.simplemobiletools.gallery;
+package com.simplemobiletools.gallery.models;
 
 public class Directory {
     private final String path;
diff --git a/app/src/main/java/com/simplemobiletools/gallery/Medium.java b/app/src/main/java/com/simplemobiletools/gallery/models/Medium.java
similarity index 90%
rename from app/src/main/java/com/simplemobiletools/gallery/Medium.java
rename to app/src/main/java/com/simplemobiletools/gallery/models/Medium.java
index 56161dd80..43d4919c4 100644
--- a/app/src/main/java/com/simplemobiletools/gallery/Medium.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/models/Medium.java
@@ -1,4 +1,4 @@
-package com.simplemobiletools.gallery;
+package com.simplemobiletools.gallery.models;
 
 import java.io.Serializable;