diff --git a/app/src/main/java/com/fox2code/mmm/ActionButtonType.java b/app/src/main/java/com/fox2code/mmm/ActionButtonType.java
index bd5f1c7..4315b80 100644
--- a/app/src/main/java/com/fox2code/mmm/ActionButtonType.java
+++ b/app/src/main/java/com/fox2code/mmm/ActionButtonType.java
@@ -18,8 +18,8 @@ import com.fox2code.mmm.installer.InstallerInitializer;
 import com.fox2code.mmm.manager.LocalModuleInfo;
 import com.fox2code.mmm.manager.ModuleInfo;
 import com.fox2code.mmm.manager.ModuleManager;
+import com.fox2code.mmm.module.ModuleHolder;
 import com.fox2code.mmm.utils.IntentHelper;
-import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import io.noties.markwon.Markwon;
diff --git a/app/src/main/java/com/fox2code/mmm/MainActivity.java b/app/src/main/java/com/fox2code/mmm/MainActivity.java
index 17bf080..ef62b1b 100644
--- a/app/src/main/java/com/fox2code/mmm/MainActivity.java
+++ b/app/src/main/java/com/fox2code/mmm/MainActivity.java
@@ -26,6 +26,8 @@ import com.fox2code.mmm.compat.CompatDisplay;
 import com.fox2code.mmm.installer.InstallerInitializer;
 import com.fox2code.mmm.manager.LocalModuleInfo;
 import com.fox2code.mmm.manager.ModuleManager;
+import com.fox2code.mmm.module.ModuleViewAdapter;
+import com.fox2code.mmm.module.ModuleViewListBuilder;
 import com.fox2code.mmm.repo.RepoManager;
 import com.fox2code.mmm.settings.SettingsActivity;
 import com.fox2code.mmm.utils.Http;
@@ -378,9 +380,7 @@ public class MainActivity extends CompatActivity implements SwipeRefreshLayout.O
         this.searchView.clearFocus();
         if (this.initMode) return false;
         if (this.moduleViewListBuilder.setQueryChange(query)) {
-            new Thread(() -> {
-                this.moduleViewListBuilder.applyTo(moduleList, moduleViewAdapter);
-            }, "Query update thread").start();
+            new Thread(() -> this.moduleViewListBuilder.applyTo(moduleList, moduleViewAdapter), "Query update thread").start();
         }
         return true;
     }
@@ -389,9 +389,7 @@ public class MainActivity extends CompatActivity implements SwipeRefreshLayout.O
     public boolean onQueryTextChange(String query) {
         if (this.initMode) return false;
         if (this.moduleViewListBuilder.setQueryChange(query)) {
-            new Thread(() -> {
-                this.moduleViewListBuilder.applyTo(moduleList, moduleViewAdapter);
-            }, "Query update thread").start();
+            new Thread(() -> this.moduleViewListBuilder.applyTo(moduleList, moduleViewAdapter), "Query update thread").start();
         }
         return false;
     }
@@ -400,9 +398,7 @@ public class MainActivity extends CompatActivity implements SwipeRefreshLayout.O
     public boolean onClose() {
         if (this.initMode) return false;
         if (this.moduleViewListBuilder.setQueryChange(null)) {
-            new Thread(() -> {
-                this.moduleViewListBuilder.applyTo(moduleList, moduleViewAdapter);
-            }, "Query update thread").start();
+            new Thread(() -> this.moduleViewListBuilder.applyTo(moduleList, moduleViewAdapter), "Query update thread").start();
         }
         return false;
     }
diff --git a/app/src/main/java/com/fox2code/mmm/ModuleHolder.java b/app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java
similarity index 98%
rename from app/src/main/java/com/fox2code/mmm/ModuleHolder.java
rename to app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java
index 416115b..2f841fe 100644
--- a/app/src/main/java/com/fox2code/mmm/ModuleHolder.java
+++ b/app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java
@@ -1,4 +1,4 @@
-package com.fox2code.mmm;
+package com.fox2code.mmm.module;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -8,6 +8,11 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 
+import com.fox2code.mmm.ActionButtonType;
+import com.fox2code.mmm.MainApplication;
+import com.fox2code.mmm.NotificationType;
+import com.fox2code.mmm.R;
+import com.fox2code.mmm.XHooks;
 import com.fox2code.mmm.manager.LocalModuleInfo;
 import com.fox2code.mmm.manager.ModuleInfo;
 import com.fox2code.mmm.repo.RepoModule;
diff --git a/app/src/main/java/com/fox2code/mmm/ModuleSorter.java b/app/src/main/java/com/fox2code/mmm/module/ModuleSorter.java
similarity index 95%
rename from app/src/main/java/com/fox2code/mmm/ModuleSorter.java
rename to app/src/main/java/com/fox2code/mmm/module/ModuleSorter.java
index 193576d..b353a2a 100644
--- a/app/src/main/java/com/fox2code/mmm/ModuleSorter.java
+++ b/app/src/main/java/com/fox2code/mmm/module/ModuleSorter.java
@@ -1,7 +1,9 @@
-package com.fox2code.mmm;
+package com.fox2code.mmm.module;
 
 import androidx.annotation.DrawableRes;
 
+import com.fox2code.mmm.R;
+
 import java.util.Comparator;
 
 public enum ModuleSorter implements Comparator<ModuleHolder> {
diff --git a/app/src/main/java/com/fox2code/mmm/ModuleViewAdapter.java b/app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java
similarity index 98%
rename from app/src/main/java/com/fox2code/mmm/ModuleViewAdapter.java
rename to app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java
index 8ea4e0f..ec47cb6 100644
--- a/app/src/main/java/com/fox2code/mmm/ModuleViewAdapter.java
+++ b/app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java
@@ -1,4 +1,4 @@
-package com.fox2code.mmm;
+package com.fox2code.mmm.module;
 
 import android.annotation.SuppressLint;
 import android.content.res.Resources;
@@ -18,11 +18,14 @@ import androidx.annotation.StringRes;
 import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.fox2code.mmm.ActionButtonType;
+import com.fox2code.mmm.MainApplication;
+import com.fox2code.mmm.NotificationType;
+import com.fox2code.mmm.R;
 import com.fox2code.mmm.manager.LocalModuleInfo;
 import com.fox2code.mmm.manager.ModuleInfo;
 import com.fox2code.mmm.manager.ModuleManager;
 import com.fox2code.mmm.repo.RepoModule;
-import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 import com.topjohnwu.superuser.internal.UiThreadHandler;
 
diff --git a/app/src/main/java/com/fox2code/mmm/ModuleViewListBuilder.java b/app/src/main/java/com/fox2code/mmm/module/ModuleViewListBuilder.java
similarity index 98%
rename from app/src/main/java/com/fox2code/mmm/ModuleViewListBuilder.java
rename to app/src/main/java/com/fox2code/mmm/module/ModuleViewListBuilder.java
index 02417ad..ba7c85c 100644
--- a/app/src/main/java/com/fox2code/mmm/ModuleViewListBuilder.java
+++ b/app/src/main/java/com/fox2code/mmm/module/ModuleViewListBuilder.java
@@ -1,4 +1,4 @@
-package com.fox2code.mmm;
+package com.fox2code.mmm.module;
 
 import android.app.Activity;
 import android.os.Build;
@@ -7,10 +7,16 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.fox2code.mmm.AppUpdateManager;
+import com.fox2code.mmm.MainApplication;
+import com.fox2code.mmm.NotificationType;
 import com.fox2code.mmm.installer.InstallerInitializer;
 import com.fox2code.mmm.manager.LocalModuleInfo;
 import com.fox2code.mmm.manager.ModuleInfo;
 import com.fox2code.mmm.manager.ModuleManager;
+import com.fox2code.mmm.module.ModuleHolder;
+import com.fox2code.mmm.module.ModuleSorter;
+import com.fox2code.mmm.module.ModuleViewAdapter;
 import com.fox2code.mmm.repo.RepoManager;
 import com.fox2code.mmm.repo.RepoModule;