diff --git a/app/build.gradle b/app/build.gradle
index 54776fdc8..f36686956 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "23.0.2"
 
     defaultConfig {
-        applicationId "gallery.simplemobiletools.com"
+        applicationId "com.simplemobiletools.gallery"
         minSdkVersion 16
         targetSdkVersion 23
         versionCode 1
diff --git a/app/src/androidTest/java/gallery/simplemobiletools/com/ApplicationTest.java b/app/src/androidTest/java/com/simplemobiletools/gallery/ApplicationTest.java
similarity index 88%
rename from app/src/androidTest/java/gallery/simplemobiletools/com/ApplicationTest.java
rename to app/src/androidTest/java/com/simplemobiletools/gallery/ApplicationTest.java
index 5c2594277..cff625a71 100644
--- a/app/src/androidTest/java/gallery/simplemobiletools/com/ApplicationTest.java
+++ b/app/src/androidTest/java/com/simplemobiletools/gallery/ApplicationTest.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package com.simplemobiletools.gallery;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4c04053db..b6a26d502 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    package="gallery.simplemobiletools.com"
+    package="com.simplemobiletools.gallery"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -12,7 +12,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".activities.MainActivity"
+            android:name="com.simplemobiletools.gallery.activities.MainActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -22,11 +22,11 @@
         </activity>
 
         <activity
-            android:name=".activities.PhotosActivity"
+            android:name="com.simplemobiletools.gallery.activities.PhotosActivity"
             android:screenOrientation="portrait"/>
 
         <activity
-            android:name=".activities.ViewPagerActivity"
+            android:name="com.simplemobiletools.gallery.activities.ViewPagerActivity"
             android:screenOrientation="portrait"/>
     </application>
 </manifest>
diff --git a/app/src/main/java/gallery/simplemobiletools/com/Constants.java b/app/src/main/java/com/simplemobiletools/gallery/Constants.java
similarity index 77%
rename from app/src/main/java/gallery/simplemobiletools/com/Constants.java
rename to app/src/main/java/com/simplemobiletools/gallery/Constants.java
index f4e2fa40d..9573045fe 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/Constants.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/Constants.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package com.simplemobiletools.gallery;
 
 public class Constants {
     public static final String DIRECTORY = "directory";
diff --git a/app/src/main/java/gallery/simplemobiletools/com/Directory.java b/app/src/main/java/com/simplemobiletools/gallery/Directory.java
similarity index 94%
rename from app/src/main/java/gallery/simplemobiletools/com/Directory.java
rename to app/src/main/java/com/simplemobiletools/gallery/Directory.java
index 10dd30abd..1dfed120c 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/Directory.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/Directory.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package com.simplemobiletools.gallery;
 
 public class Directory {
     private final String path;
diff --git a/app/src/main/java/gallery/simplemobiletools/com/MyImageView.java b/app/src/main/java/com/simplemobiletools/gallery/MyImageView.java
similarity index 94%
rename from app/src/main/java/gallery/simplemobiletools/com/MyImageView.java
rename to app/src/main/java/com/simplemobiletools/gallery/MyImageView.java
index f2fd7800a..8b94e9dc3 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/MyImageView.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/MyImageView.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package com.simplemobiletools.gallery;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/gallery/simplemobiletools/com/MyViewPager.java b/app/src/main/java/com/simplemobiletools/gallery/MyViewPager.java
similarity index 95%
rename from app/src/main/java/gallery/simplemobiletools/com/MyViewPager.java
rename to app/src/main/java/com/simplemobiletools/gallery/MyViewPager.java
index 85db99f27..c73a153f1 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/MyViewPager.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/MyViewPager.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package com.simplemobiletools.gallery;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;
diff --git a/app/src/main/java/gallery/simplemobiletools/com/ViewPagerFragment.java b/app/src/main/java/com/simplemobiletools/gallery/ViewPagerFragment.java
similarity index 91%
rename from app/src/main/java/gallery/simplemobiletools/com/ViewPagerFragment.java
rename to app/src/main/java/com/simplemobiletools/gallery/ViewPagerFragment.java
index dac9877c7..c652897e8 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/ViewPagerFragment.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/ViewPagerFragment.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package com.simplemobiletools.gallery;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -9,7 +9,7 @@ import android.view.ViewGroup;
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
 
-import gallery.simplemobiletools.com.activities.ViewPagerActivity;
+import com.simplemobiletools.gallery.activities.ViewPagerActivity;
 
 public class ViewPagerFragment extends Fragment implements View.OnClickListener {
     private String path;
diff --git a/app/src/main/java/gallery/simplemobiletools/com/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
similarity index 90%
rename from app/src/main/java/gallery/simplemobiletools/com/activities/MainActivity.java
rename to app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
index 18b8d9c81..f60776446 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/activities/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com.activities;
+package com.simplemobiletools.gallery.activities;
 
 import android.content.Intent;
 import android.database.Cursor;
@@ -16,12 +16,11 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 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;
+import com.simplemobiletools.gallery.Constants;
+import com.simplemobiletools.gallery.Directory;
+import com.simplemobiletools.gallery.R;
+import com.simplemobiletools.gallery.adapters.DirectoryAdapter;
 
 public class MainActivity extends AppCompatActivity implements OnItemClickListener {
     private List<Directory> dirs;
diff --git a/app/src/main/java/gallery/simplemobiletools/com/activities/PhotosActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java
similarity index 92%
rename from app/src/main/java/gallery/simplemobiletools/com/activities/PhotosActivity.java
rename to app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java
index 4aa68e414..3e31d0e91 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/activities/PhotosActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com.activities;
+package com.simplemobiletools.gallery.activities;
 
 import android.content.Intent;
 import android.database.Cursor;
@@ -14,9 +14,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import gallery.simplemobiletools.com.Constants;
-import gallery.simplemobiletools.com.R;
-import gallery.simplemobiletools.com.adapters.PhotosAdapter;
+import com.simplemobiletools.gallery.Constants;
+import com.simplemobiletools.gallery.R;
+import com.simplemobiletools.gallery.adapters.PhotosAdapter;
 
 public class PhotosActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
     private List<String> photos;
diff --git a/app/src/main/java/gallery/simplemobiletools/com/activities/ViewPagerActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
similarity index 95%
rename from app/src/main/java/gallery/simplemobiletools/com/activities/ViewPagerActivity.java
rename to app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
index 7a7bbdaed..c16dc0b23 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/activities/ViewPagerActivity.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com.activities;
+package com.simplemobiletools.gallery.activities;
 
 import android.content.Intent;
 import android.database.Cursor;
@@ -16,10 +16,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import gallery.simplemobiletools.com.Constants;
-import gallery.simplemobiletools.com.MyViewPager;
-import gallery.simplemobiletools.com.R;
-import gallery.simplemobiletools.com.adapters.MyPagerAdapter;
+import com.simplemobiletools.gallery.Constants;
+import com.simplemobiletools.gallery.MyViewPager;
+import com.simplemobiletools.gallery.R;
+import com.simplemobiletools.gallery.adapters.MyPagerAdapter;
 
 public class ViewPagerActivity extends AppCompatActivity {
     private int pos;
diff --git a/app/src/main/java/gallery/simplemobiletools/com/adapters/DirectoryAdapter.java b/app/src/main/java/com/simplemobiletools/gallery/adapters/DirectoryAdapter.java
similarity index 93%
rename from app/src/main/java/gallery/simplemobiletools/com/adapters/DirectoryAdapter.java
rename to app/src/main/java/com/simplemobiletools/gallery/adapters/DirectoryAdapter.java
index 40d597f41..75c6abb57 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/adapters/DirectoryAdapter.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/adapters/DirectoryAdapter.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com.adapters;
+package com.simplemobiletools.gallery.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@ import com.bumptech.glide.Glide;
 
 import java.util.List;
 
-import gallery.simplemobiletools.com.Directory;
-import gallery.simplemobiletools.com.R;
+import com.simplemobiletools.gallery.Directory;
+import com.simplemobiletools.gallery.R;
 
 public class DirectoryAdapter extends BaseAdapter {
     private final Context context;
diff --git a/app/src/main/java/gallery/simplemobiletools/com/adapters/MyPagerAdapter.java b/app/src/main/java/com/simplemobiletools/gallery/adapters/MyPagerAdapter.java
similarity index 87%
rename from app/src/main/java/gallery/simplemobiletools/com/adapters/MyPagerAdapter.java
rename to app/src/main/java/com/simplemobiletools/gallery/adapters/MyPagerAdapter.java
index a429858db..d3565d353 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/adapters/MyPagerAdapter.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/adapters/MyPagerAdapter.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com.adapters;
+package com.simplemobiletools.gallery.adapters;
 
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -6,7 +6,7 @@ import android.support.v4.app.FragmentStatePagerAdapter;
 
 import java.util.List;
 
-import gallery.simplemobiletools.com.ViewPagerFragment;
+import com.simplemobiletools.gallery.ViewPagerFragment;
 
 public class MyPagerAdapter extends FragmentStatePagerAdapter {
     private List<String> paths;
diff --git a/app/src/main/java/gallery/simplemobiletools/com/adapters/PhotosAdapter.java b/app/src/main/java/com/simplemobiletools/gallery/adapters/PhotosAdapter.java
similarity index 94%
rename from app/src/main/java/gallery/simplemobiletools/com/adapters/PhotosAdapter.java
rename to app/src/main/java/com/simplemobiletools/gallery/adapters/PhotosAdapter.java
index 0c9ca31d4..1a4188f31 100644
--- a/app/src/main/java/gallery/simplemobiletools/com/adapters/PhotosAdapter.java
+++ b/app/src/main/java/com/simplemobiletools/gallery/adapters/PhotosAdapter.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com.adapters;
+package com.simplemobiletools.gallery.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -11,7 +11,7 @@ import com.bumptech.glide.Glide;
 
 import java.util.List;
 
-import gallery.simplemobiletools.com.R;
+import com.simplemobiletools.gallery.R;
 
 public class PhotosAdapter extends BaseAdapter {
     private final Context context;
diff --git a/app/src/main/res/layout/activity_photo.xml b/app/src/main/res/layout/activity_photo.xml
index 9c5d72001..65e9046c1 100644
--- a/app/src/main/res/layout/activity_photo.xml
+++ b/app/src/main/res/layout/activity_photo.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:background="@android:color/black">
 
-    <gallery.simplemobiletools.com.MyViewPager
+    <com.simplemobiletools.gallery.MyViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/directory_item.xml b/app/src/main/res/layout/directory_item.xml
index 0c65fd489..6e2d7a407 100644
--- a/app/src/main/res/layout/directory_item.xml
+++ b/app/src/main/res/layout/directory_item.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:background="@color/tmb_background">
 
-    <gallery.simplemobiletools.com.MyImageView
+    <com.simplemobiletools.gallery.MyImageView
         android:id="@+id/dir_thumbnail"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/app/src/main/res/layout/photo_item.xml b/app/src/main/res/layout/photo_item.xml
index fc8a2ce07..aee17950b 100644
--- a/app/src/main/res/layout/photo_item.xml
+++ b/app/src/main/res/layout/photo_item.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:background="@color/tmb_background">
 
-    <gallery.simplemobiletools.com.MyImageView
+    <com.simplemobiletools.gallery.MyImageView
         android:id="@+id/photo_thumbnail"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/app/src/test/java/gallery/simplemobiletools/com/ExampleUnitTest.java b/app/src/test/java/gallery/simplemobiletools/com/ExampleUnitTest.java
index 40e55e638..48c66b967 100644
--- a/app/src/test/java/gallery/simplemobiletools/com/ExampleUnitTest.java
+++ b/app/src/test/java/gallery/simplemobiletools/com/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package gallery.simplemobiletools.com;
+package com.simplemobiletools.gallery;
 
 import org.junit.Test;