diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3fe3afef..43696544 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -215,7 +215,7 @@
         </activity>
 
         <activity
-            android:name=".activities.DirectMessages"
+            android:name=".activities.directmessages.DirectMessages"
             android:parentActivityName=".activities.Main">
 
             <meta-data
@@ -224,12 +224,12 @@
         </activity>
 
         <activity
-            android:name=".activities.DirectMessageThread"
-            android:parentActivityName=".activities.DirectMessages">
+            android:name=".activities.directmessages.DirectMessageThread"
+            android:parentActivityName=".activities.directmessages.DirectMessages">
 
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.DirectMessages" />
+                android:value=".activities.directmessages.DirectMessages" />
         </activity>
 
         <provider
diff --git a/app/src/main/java/awais/instagrabber/activities/Main.java b/app/src/main/java/awais/instagrabber/activities/Main.java
index 11b4193d..c80af18f 100755
--- a/app/src/main/java/awais/instagrabber/activities/Main.java
+++ b/app/src/main/java/awais/instagrabber/activities/Main.java
@@ -29,6 +29,7 @@ import java.util.Stack;
 import awais.instagrabber.BuildConfig;
 import awais.instagrabber.MainHelper;
 import awais.instagrabber.R;
+import awais.instagrabber.activities.directmessages.DirectMessages;
 import awais.instagrabber.adapters.HighlightsAdapter;
 import awais.instagrabber.adapters.SuggestionsAdapter;
 import awais.instagrabber.asyncs.SuggestionsFetcher;
diff --git a/app/src/main/java/awais/instagrabber/activities/DirectMessageThread.java b/app/src/main/java/awais/instagrabber/activities/directmessages/DirectMessageThread.java
similarity index 98%
rename from app/src/main/java/awais/instagrabber/activities/DirectMessageThread.java
rename to app/src/main/java/awais/instagrabber/activities/directmessages/DirectMessageThread.java
index 80a42dea..bbec718a 100644
--- a/app/src/main/java/awais/instagrabber/activities/DirectMessageThread.java
+++ b/app/src/main/java/awais/instagrabber/activities/directmessages/DirectMessageThread.java
@@ -1,4 +1,4 @@
-package awais.instagrabber.activities;
+package awais.instagrabber.activities.directmessages;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -24,6 +24,10 @@ import java.util.Collections;
 import java.util.List;
 
 import awais.instagrabber.R;
+import awais.instagrabber.activities.BaseLanguageActivity;
+import awais.instagrabber.activities.PostViewer;
+import awais.instagrabber.activities.ProfileViewer;
+import awais.instagrabber.activities.StoryViewer;
 import awais.instagrabber.adapters.MessageItemsAdapter;
 import awais.instagrabber.asyncs.direct_messages.CommentAction;
 import awais.instagrabber.asyncs.direct_messages.UserInboxFetcher;
diff --git a/app/src/main/java/awais/instagrabber/activities/DirectMessages.java b/app/src/main/java/awais/instagrabber/activities/directmessages/DirectMessages.java
old mode 100755
new mode 100644
similarity index 97%
rename from app/src/main/java/awais/instagrabber/activities/DirectMessages.java
rename to app/src/main/java/awais/instagrabber/activities/directmessages/DirectMessages.java
index 6a4245d5..8a6408e9
--- a/app/src/main/java/awais/instagrabber/activities/DirectMessages.java
+++ b/app/src/main/java/awais/instagrabber/activities/directmessages/DirectMessages.java
@@ -1,4 +1,4 @@
-package awais.instagrabber.activities;
+package awais.instagrabber.activities.directmessages;
 
 import android.content.Intent;
 import android.os.AsyncTask;
@@ -16,6 +16,7 @@ import java.util.Arrays;
 
 import awais.instagrabber.R;
 import awais.instagrabber.BuildConfig;
+import awais.instagrabber.activities.BaseLanguageActivity;
 import awais.instagrabber.adapters.DirectMessagesAdapter;
 import awais.instagrabber.asyncs.direct_messages.InboxFetcher;
 import awais.instagrabber.customviews.helpers.RecyclerLazyLoader;
diff --git a/app/src/main/res/layout/activity_dms.xml b/app/src/main/res/layout/activity_dms.xml
index 6bd5f945..2d7c0f83 100755
--- a/app/src/main/res/layout/activity_dms.xml
+++ b/app/src/main/res/layout/activity_dms.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".activities.DirectMessages">
+    tools:context=".activities.directmessages.DirectMessages">
 
     <include
         android:id="@+id/toolbar"