diff --git a/app_2009scape/src/main/AndroidManifest.xml b/app_2009scape/src/main/AndroidManifest.xml
index 58e331c23..bbcba1014 100644
--- a/app_2009scape/src/main/AndroidManifest.xml
+++ b/app_2009scape/src/main/AndroidManifest.xml
@@ -41,7 +41,7 @@
-
+
-
+
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseActivity.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseActivity.java
index c049ea40f..efb8bc56c 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseActivity.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseActivity.java
@@ -1,12 +1,9 @@
package net.kdt.pojavlaunch;
-import android.content.*;
import android.os.*;
import androidx.appcompat.app.*;
import net.kdt.pojavlaunch.utils.*;
-import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_IGNORE_NOTCH;
-
public class BaseActivity extends AppCompatActivity
{
@Override
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
index 9ab11d85f..6f20b95ce 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
@@ -1,13 +1,13 @@
package net.kdt.pojavlaunch;
-import static net.kdt.pojavlaunch.Tools.getFileName;
-
import android.app.*;
import android.content.*;
import android.view.*;
import androidx.annotation.Nullable;
+import net.kdt.pojavlaunch.utils.Tools;
+
public abstract class BaseLauncherActivity extends BaseActivity {
protected boolean canBack = false;
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index d0157c38b..4a17677e2 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -1,31 +1,21 @@
package net.kdt.pojavlaunch;
-import static net.kdt.pojavlaunch.Architecture.ARCH_X86;
-import static net.kdt.pojavlaunch.Tools.currentDisplayMetrics;
+import static net.kdt.pojavlaunch.utils.Architecture.ARCH_X86;
import static org.lwjgl.glfw.CallbackBridge.sendKeyPress;
-import static org.lwjgl.glfw.CallbackBridge.windowHeight;
-import static org.lwjgl.glfw.CallbackBridge.windowWidth;
-import android.annotation.SuppressLint;
import android.app.*;
import android.content.*;
import android.content.pm.PackageManager;
import android.os.*;
import android.util.*;
import android.view.*;
-import android.widget.*;
-import androidx.drawerlayout.widget.*;
-import com.google.android.material.navigation.*;
-import com.kdt.LoggerView;
+import net.kdt.pojavlaunch.utils.Tools;
import java.io.*;
import java.util.*;
-import net.kdt.pojavlaunch.prefs.*;
-import org.lwjgl.glfw.*;
-
public class BaseMainActivity extends BaseActivity {
public static volatile ClipboardManager GLOBAL_CLIPBOARD;
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
index 8b03c0019..e3d387d52 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
@@ -5,7 +5,6 @@ import android.app.ActivityManager;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
-import android.net.Uri;
import android.os.*;
import android.os.Vibrator;
import android.util.Log;
@@ -16,14 +15,14 @@ import android.widget.*;
import java.io.*;
import java.util.*;
-import net.kdt.SoundService;
+import net.kdt.pojavlaunch.sound.JAudioManager;
+import net.kdt.pojavlaunch.sound.SoundService;
import net.kdt.pojavlaunch.multirt.MultiRTUtils;
import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.utils.*;
import org.lwjgl.glfw.*;
-import static net.kdt.pojavlaunch.Tools.currentDisplayMetrics;
-import static net.kdt.pojavlaunch.Tools.getFileName;
+import static net.kdt.pojavlaunch.utils.Tools.currentDisplayMetrics;
import static net.kdt.pojavlaunch.utils.MathUtils.map;
import androidx.preference.PreferenceManager;
@@ -130,7 +129,7 @@ public class JavaGUILauncherActivity extends BaseActivity implements View.OnTou
// Launch Settings Popup
findViewById(R.id.menu).setOnTouchListener((view, motionEvent) -> {
if(motionEvent.getAction() == MotionEvent.ACTION_DOWN){
- startActivity(new Intent(JavaGUILauncherActivity.this, SettingsMenu.class));
+ startActivity(new Intent(JavaGUILauncherActivity.this, SettingsActivity.class));
}
return false;
});
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/Logger.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/Logger.java
index c8dc6f4fb..ef455ec5c 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/Logger.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/Logger.java
@@ -3,6 +3,7 @@ package net.kdt.pojavlaunch;
import androidx.annotation.Keep;
import net.kdt.pojavlaunch.utils.JMessageHandler;
+import net.kdt.pojavlaunch.utils.Tools;
import java.io.File;
import java.io.IOException;
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index 0b6c2ed0f..7d9c46124 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -1,15 +1,12 @@
package net.kdt.pojavlaunch;
-import static net.kdt.pojavlaunch.Architecture.archAsString;
-import static net.kdt.pojavlaunch.Tools.getFileName;
+import static net.kdt.pojavlaunch.utils.Architecture.archAsString;
import android.Manifest;
-import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.res.AssetManager;
-import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
@@ -28,13 +25,12 @@ import androidx.core.content.ContextCompat;
import net.kdt.pojavlaunch.multirt.MultiRTUtils;
import net.kdt.pojavlaunch.prefs.LauncherPreferences;
+import net.kdt.pojavlaunch.utils.Tools;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/SettingsMenu.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/SettingsActivity.java
similarity index 98%
rename from app_2009scape/src/main/java/net/kdt/pojavlaunch/SettingsMenu.java
rename to app_2009scape/src/main/java/net/kdt/pojavlaunch/SettingsActivity.java
index 250407a51..cfa8dc227 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/SettingsMenu.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/SettingsActivity.java
@@ -21,13 +21,14 @@ import androidx.preference.PreferenceManager;
import com.google.android.material.switchmaterial.SwitchMaterial;
import net.kdt.pojavlaunch.prefs.LauncherPreferences;
+import net.kdt.pojavlaunch.utils.Tools;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-public class SettingsMenu extends Activity {
+public class SettingsActivity extends Activity {
private static final int FILE_SELECT_CODE = 0;
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/TapDetector.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/TapDetector.java
index 9aaeeeeca..3d7d71fce 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/TapDetector.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/TapDetector.java
@@ -7,6 +7,8 @@ import static android.view.MotionEvent.ACTION_POINTER_DOWN;
import static android.view.MotionEvent.ACTION_POINTER_UP;
import static android.view.MotionEvent.ACTION_UP;
+import net.kdt.pojavlaunch.utils.Tools;
+
/**
* Class aiming at better detecting X-tap events regardless of the POINTERS
* Only uses the least amount of events possible,
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/fragments/CrashFragment.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/fragments/CrashFragment.java
index 4ad687bfc..3fc9f1772 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/fragments/CrashFragment.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/fragments/CrashFragment.java
@@ -7,6 +7,7 @@ import android.view.*;
import android.widget.*;
import java.io.*;
import net.kdt.pojavlaunch.*;
+import net.kdt.pojavlaunch.utils.Tools;
import android.graphics.*;
import androidx.fragment.app.Fragment;
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTUtils.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTUtils.java
index a5f717ca5..ac02c5d67 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTUtils.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTUtils.java
@@ -4,7 +4,7 @@ import android.content.Context;
import android.system.Os;
import net.kdt.pojavlaunch.R;
-import net.kdt.pojavlaunch.Tools;
+import net.kdt.pojavlaunch.utils.Tools;
import net.kdt.pojavlaunch.utils.JREUtils;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
index b2d13ac1d..a6b83d332 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
@@ -1,9 +1,10 @@
package net.kdt.pojavlaunch.prefs;
import android.content.*;
-import net.kdt.pojavlaunch.*;
+
import net.kdt.pojavlaunch.multirt.MultiRTUtils;
import net.kdt.pojavlaunch.utils.JREUtils;
+import net.kdt.pojavlaunch.utils.Tools;
public class LauncherPreferences
{
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/scoped/GameFolderProvider.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/scoped/GameFolderProvider.java
index cdf997062..86a249d56 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/scoped/GameFolderProvider.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/scoped/GameFolderProvider.java
@@ -14,7 +14,7 @@ import android.webkit.MimeTypeMap;
import androidx.annotation.Nullable;
import net.kdt.pojavlaunch.R;
-import net.kdt.pojavlaunch.Tools;
+import net.kdt.pojavlaunch.utils.Tools;
import java.io.File;
import java.io.FileNotFoundException;
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/JAudioManager.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/sound/JAudioManager.java
similarity index 91%
rename from app_2009scape/src/main/java/net/kdt/pojavlaunch/JAudioManager.java
rename to app_2009scape/src/main/java/net/kdt/pojavlaunch/sound/JAudioManager.java
index 75a98df91..64f3afbc8 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/JAudioManager.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/sound/JAudioManager.java
@@ -1,10 +1,8 @@
-package net.kdt.pojavlaunch;
+package net.kdt.pojavlaunch.sound;
-import android.app.ActivityManager;
-import android.content.Context;
import android.content.Intent;
-import net.kdt.SoundService;
+import net.kdt.pojavlaunch.JavaGUILauncherActivity;
public class JAudioManager {
diff --git a/app_2009scape/src/main/java/net/kdt/SoundService.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/sound/SoundService.java
similarity index 97%
rename from app_2009scape/src/main/java/net/kdt/SoundService.java
rename to app_2009scape/src/main/java/net/kdt/pojavlaunch/sound/SoundService.java
index fbaf28ad1..68e4908bb 100644
--- a/app_2009scape/src/main/java/net/kdt/SoundService.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/sound/SoundService.java
@@ -1,4 +1,4 @@
-package net.kdt;
+package net.kdt.pojavlaunch.sound;
import android.app.Service;
import android.content.Intent;
@@ -7,7 +7,7 @@ import android.net.Uri;
import android.os.IBinder;
import android.util.Log;
-import net.kdt.pojavlaunch.Tools;
+import net.kdt.pojavlaunch.utils.Tools;
import java.io.File;
import java.io.IOException;
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/Architecture.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/Architecture.java
similarity index 98%
rename from app_2009scape/src/main/java/net/kdt/pojavlaunch/Architecture.java
rename to app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/Architecture.java
index 8d0cbc694..45b9ad6ee 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/Architecture.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/Architecture.java
@@ -1,4 +1,4 @@
-package net.kdt.pojavlaunch;
+package net.kdt.pojavlaunch.utils;
import android.os.Build;
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JMessageHandler.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JMessageHandler.java
index be3719a98..fe26393e3 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JMessageHandler.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JMessageHandler.java
@@ -1,6 +1,6 @@
package net.kdt.pojavlaunch.utils;
-import net.kdt.pojavlaunch.JAudioManager;
+import net.kdt.pojavlaunch.sound.JAudioManager;
import net.kdt.pojavlaunch.JavaGUILauncherActivity;
public class JMessageHandler {
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
index 6a9b62027..8aa22fdc6 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
@@ -1,9 +1,9 @@
package net.kdt.pojavlaunch.utils;
-import static net.kdt.pojavlaunch.Architecture.ARCH_X86;
-import static net.kdt.pojavlaunch.Architecture.archAsString;
-import static net.kdt.pojavlaunch.Architecture.is64BitsDevice;
-import static net.kdt.pojavlaunch.Tools.LOCAL_RENDERER;
+import static net.kdt.pojavlaunch.utils.Architecture.ARCH_X86;
+import static net.kdt.pojavlaunch.utils.Architecture.archAsString;
+import static net.kdt.pojavlaunch.utils.Architecture.is64BitsDevice;
+import static net.kdt.pojavlaunch.utils.Tools.LOCAL_RENDERER;
import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_GLES_SHRINK_HACK;
import android.app.*;
@@ -11,7 +11,6 @@ import android.content.*;
import android.os.Build;
import android.system.*;
import android.util.*;
-import android.widget.Toast;
import com.oracle.dalvik.*;
import java.io.*;
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/LWJGLGLFWKeycode.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/LWJGLGLFWKeycode.java
similarity index 99%
rename from app_2009scape/src/main/java/net/kdt/pojavlaunch/LWJGLGLFWKeycode.java
rename to app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/LWJGLGLFWKeycode.java
index 5482b01f6..6c63088b1 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/LWJGLGLFWKeycode.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/LWJGLGLFWKeycode.java
@@ -28,7 +28,7 @@
*
*************************************************************************/
-package net.kdt.pojavlaunch;
+package net.kdt.pojavlaunch.utils;
public class LWJGLGLFWKeycode
{
diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/Tools.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/Tools.java
similarity index 98%
rename from app_2009scape/src/main/java/net/kdt/pojavlaunch/Tools.java
rename to app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/Tools.java
index d40b1bb0b..bbf99d9b5 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/Tools.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/utils/Tools.java
@@ -1,28 +1,26 @@
-package net.kdt.pojavlaunch;
+package net.kdt.pojavlaunch.utils;
import android.app.*;
import android.content.*;
import android.database.Cursor;
import android.net.*;
import android.os.*;
-import android.provider.OpenableColumns;
import android.util.*;
import com.google.gson.*;
import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
import java.nio.charset.*;
import java.util.*;
import java.util.zip.*;
-import net.kdt.pojavlaunch.utils.*;
-import org.apache.commons.codec.binary.Hex;
+import net.kdt.pojavlaunch.BaseMainActivity;
+import net.kdt.pojavlaunch.BuildConfig;
+import net.kdt.pojavlaunch.R;
+
import org.lwjgl.glfw.*;
import android.view.*;
import static android.os.Build.VERSION.SDK_INT;
-import static android.os.Build.VERSION_CODES.P;
import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_IGNORE_NOTCH;
import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_NOTCH_SIZE;
diff --git a/app_2009scape/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/app_2009scape/src/main/java/org/lwjgl/glfw/CallbackBridge.java
index d4396e9f4..ab39da2cf 100644
--- a/app_2009scape/src/main/java/org/lwjgl/glfw/CallbackBridge.java
+++ b/app_2009scape/src/main/java/org/lwjgl/glfw/CallbackBridge.java
@@ -4,6 +4,8 @@ import android.os.Handler;
import android.os.Looper;
import net.kdt.pojavlaunch.*;
+import net.kdt.pojavlaunch.utils.LWJGLGLFWKeycode;
+
import android.content.*;
public class CallbackBridge {