diff --git a/app/src/main/java/awais/instagrabber/MainHelper.java b/app/src/main/java/awais/instagrabber/MainHelper.java
index 0769093a..8421fdb6 100755
--- a/app/src/main/java/awais/instagrabber/MainHelper.java
+++ b/app/src/main/java/awais/instagrabber/MainHelper.java
@@ -49,7 +49,7 @@
 // import java.util.HashMap;
 // import java.util.Map;
 //
-// import awais.instagrabber.activities.CommentsViewerFragment;
+// import awais.instagrabber.fragments.CommentsViewerFragment;
 // import awais.instagrabber.activities.MainActivityBackup;
 // import awais.instagrabber.activities.PostViewer;
 // import awais.instagrabber.adapters.DiscoverAdapter;
diff --git a/app/src/main/java/awais/instagrabber/activities/CommentsViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/CommentsViewerFragment.java
similarity index 98%
rename from app/src/main/java/awais/instagrabber/activities/CommentsViewerFragment.java
rename to app/src/main/java/awais/instagrabber/fragments/CommentsViewerFragment.java
index b1ed6029..39a0159a 100644
--- a/app/src/main/java/awais/instagrabber/activities/CommentsViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/CommentsViewerFragment.java
@@ -1,4 +1,4 @@
-package awais.instagrabber.activities;
+package awais.instagrabber.fragments;
 
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -33,6 +33,9 @@ import androidx.navigation.fragment.NavHostFragment;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import awais.instagrabber.R;
+import awais.instagrabber.activities.CommentsViewerFragmentArgs;
+import awais.instagrabber.activities.CommentsViewerFragmentDirections;
+import awais.instagrabber.activities.ProfilePicViewer;
 import awais.instagrabber.adapters.CommentsAdapter;
 import awais.instagrabber.asyncs.CommentsFetcher;
 import awais.instagrabber.databinding.FragmentCommentsBinding;
diff --git a/app/src/main/java/awais/instagrabber/activities/FollowViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/FollowViewerFragment.java
similarity index 98%
rename from app/src/main/java/awais/instagrabber/activities/FollowViewerFragment.java
rename to app/src/main/java/awais/instagrabber/fragments/FollowViewerFragment.java
index 87c9fc22..0fa19a91 100644
--- a/app/src/main/java/awais/instagrabber/activities/FollowViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/FollowViewerFragment.java
@@ -1,4 +1,4 @@
-package awais.instagrabber.activities;
+package awais.instagrabber.fragments;
 
 import android.content.res.Resources;
 import android.os.AsyncTask;
@@ -25,6 +25,8 @@ import java.util.Arrays;
 
 import awais.instagrabber.BuildConfig;
 import awais.instagrabber.R;
+import awais.instagrabber.activities.FollowViewerFragmentArgs;
+import awais.instagrabber.activities.FollowViewerFragmentDirections;
 import awais.instagrabber.adapters.FollowAdapter;
 import awais.instagrabber.asyncs.FollowFetcher;
 import awais.instagrabber.databinding.FragmentFollowersViewerBinding;
diff --git a/app/src/main/res/layout/fragment_followers_viewer.xml b/app/src/main/res/layout/fragment_followers_viewer.xml
index f87d1d0c..3d5a21ae 100644
--- a/app/src/main/res/layout/fragment_followers_viewer.xml
+++ b/app/src/main/res/layout/fragment_followers_viewer.xml
@@ -5,7 +5,7 @@
     android:id="@+id/swipeRefreshLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activities.FollowViewerFragment">
+    tools:context=".fragments.FollowViewerFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvFollow"
diff --git a/app/src/main/res/navigation/comments_nav_graph.xml b/app/src/main/res/navigation/comments_nav_graph.xml
index 9a479010..3e2f3b82 100644
--- a/app/src/main/res/navigation/comments_nav_graph.xml
+++ b/app/src/main/res/navigation/comments_nav_graph.xml
@@ -29,7 +29,7 @@
 
     <fragment
         android:id="@+id/commentsViewerFragment"
-        android:name="awais.instagrabber.activities.CommentsViewerFragment"
+        android:name="awais.instagrabber.fragments.CommentsViewerFragment"
         android:label="Comments"
         tools:layout="@layout/fragment_comments">
         <argument
diff --git a/app/src/main/res/navigation/profile_nav_graph.xml b/app/src/main/res/navigation/profile_nav_graph.xml
index b73a80fc..a2adcb57 100644
--- a/app/src/main/res/navigation/profile_nav_graph.xml
+++ b/app/src/main/res/navigation/profile_nav_graph.xml
@@ -81,7 +81,7 @@
     </fragment>
     <fragment
         android:id="@+id/followViewerFragment"
-        android:name="awais.instagrabber.activities.FollowViewerFragment"
+        android:name="awais.instagrabber.fragments.FollowViewerFragment"
         android:label="Followers"
         tools:layout="@layout/fragment_followers_viewer">
         <argument