diff --git a/app_solcraftlauncher/app_pojavlauncher/app_pojavlauncher.iml b/app_solcraftlauncher/app_pojavlauncher.iml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/app_pojavlauncher.iml rename to app_solcraftlauncher/app_pojavlauncher.iml diff --git a/app_solcraftlauncher/app_pojavlauncher/build.gradle b/app_solcraftlauncher/build.gradle similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/build.gradle rename to app_solcraftlauncher/build.gradle diff --git a/app_solcraftlauncher/app_pojavlauncher/debug.keystore b/app_solcraftlauncher/debug.keystore similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/debug.keystore rename to app_solcraftlauncher/debug.keystore diff --git a/app_solcraftlauncher/app_pojavlauncher/libs/ExagearApacheCommons.jar b/app_solcraftlauncher/libs/ExagearApacheCommons.jar similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/libs/ExagearApacheCommons.jar rename to app_solcraftlauncher/libs/ExagearApacheCommons.jar diff --git a/app_solcraftlauncher/app_pojavlauncher/libs/gson-2.8.6.jar b/app_solcraftlauncher/libs/gson-2.8.6.jar similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/libs/gson-2.8.6.jar rename to app_solcraftlauncher/libs/gson-2.8.6.jar diff --git a/app_solcraftlauncher/app_pojavlauncher/proguard-rules.pro b/app_solcraftlauncher/proguard-rules.pro similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/proguard-rules.pro rename to app_solcraftlauncher/proguard-rules.pro diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/AndroidManifest.xml b/app_solcraftlauncher/src/main/AndroidManifest.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/AndroidManifest.xml rename to app_solcraftlauncher/src/main/AndroidManifest.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/about_en.txt b/app_solcraftlauncher/src/main/assets/about_en.txt similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/about_en.txt rename to app_solcraftlauncher/src/main/assets/about_en.txt diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/arc_dns_injector/arc_dns_injector.jar b/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/arc_dns_injector.jar similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/arc_dns_injector/arc_dns_injector.jar rename to app_solcraftlauncher/src/main/assets/components/arc_dns_injector/arc_dns_injector.jar diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version b/app_solcraftlauncher/src/main/assets/components/arc_dns_injector/version similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/arc_dns_injector/version rename to app_solcraftlauncher/src/main/assets/components/arc_dns_injector/version diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo/ResConfHack.jar b/app_solcraftlauncher/src/main/assets/components/caciocavallo/ResConfHack.jar similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo/ResConfHack.jar rename to app_solcraftlauncher/src/main/assets/components/caciocavallo/ResConfHack.jar diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo/cacio-androidnw-1.10-SNAPSHOT.jar b/app_solcraftlauncher/src/main/assets/components/caciocavallo/cacio-androidnw-1.10-SNAPSHOT.jar similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo/cacio-androidnw-1.10-SNAPSHOT.jar rename to app_solcraftlauncher/src/main/assets/components/caciocavallo/cacio-androidnw-1.10-SNAPSHOT.jar diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo/cacio-shared-1.10-SNAPSHOT.jar b/app_solcraftlauncher/src/main/assets/components/caciocavallo/cacio-shared-1.10-SNAPSHOT.jar similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo/cacio-shared-1.10-SNAPSHOT.jar rename to app_solcraftlauncher/src/main/assets/components/caciocavallo/cacio-shared-1.10-SNAPSHOT.jar diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo/version b/app_solcraftlauncher/src/main/assets/components/caciocavallo/version similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo/version rename to app_solcraftlauncher/src/main/assets/components/caciocavallo/version diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar b/app_solcraftlauncher/src/main/assets/components/caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar rename to app_solcraftlauncher/src/main/assets/components/caciocavallo17/cacio-shared-1.18-SNAPSHOT.jar diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar b/app_solcraftlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar rename to app_solcraftlauncher/src/main/assets/components/caciocavallo17/cacio-tta-1.18-SNAPSHOT.jar diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo17/version b/app_solcraftlauncher/src/main/assets/components/caciocavallo17/version similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/caciocavallo17/version rename to app_solcraftlauncher/src/main/assets/components/caciocavallo17/version diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/forge_installer/forge_installer.jar b/app_solcraftlauncher/src/main/assets/components/forge_installer/forge_installer.jar similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/forge_installer/forge_installer.jar rename to app_solcraftlauncher/src/main/assets/components/forge_installer/forge_installer.jar diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/forge_installer/version b/app_solcraftlauncher/src/main/assets/components/forge_installer/version similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/forge_installer/version rename to app_solcraftlauncher/src/main/assets/components/forge_installer/version diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar b/app_solcraftlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar rename to app_solcraftlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/lwjgl3/version b/app_solcraftlauncher/src/main/assets/components/lwjgl3/version similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/lwjgl3/version rename to app_solcraftlauncher/src/main/assets/components/lwjgl3/version diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/security/java_sandbox.policy b/app_solcraftlauncher/src/main/assets/components/security/java_sandbox.policy similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/security/java_sandbox.policy rename to app_solcraftlauncher/src/main/assets/components/security/java_sandbox.policy diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/security/log4j-rce-patch-1.12.xml b/app_solcraftlauncher/src/main/assets/components/security/log4j-rce-patch-1.12.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/security/log4j-rce-patch-1.12.xml rename to app_solcraftlauncher/src/main/assets/components/security/log4j-rce-patch-1.12.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/security/log4j-rce-patch-1.7.xml b/app_solcraftlauncher/src/main/assets/components/security/log4j-rce-patch-1.7.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/security/log4j-rce-patch-1.7.xml rename to app_solcraftlauncher/src/main/assets/components/security/log4j-rce-patch-1.7.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/security/pro-grade.jar b/app_solcraftlauncher/src/main/assets/components/security/pro-grade.jar similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/security/pro-grade.jar rename to app_solcraftlauncher/src/main/assets/components/security/pro-grade.jar diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/security/version b/app_solcraftlauncher/src/main/assets/components/security/version similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/components/security/version rename to app_solcraftlauncher/src/main/assets/components/security/version diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/default.json b/app_solcraftlauncher/src/main/assets/default.json similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/default.json rename to app_solcraftlauncher/src/main/assets/default.json diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/font/LICENSE_OFL.txt b/app_solcraftlauncher/src/main/assets/font/LICENSE_OFL.txt similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/font/LICENSE_OFL.txt rename to app_solcraftlauncher/src/main/assets/font/LICENSE_OFL.txt diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/language_list.txt b/app_solcraftlauncher/src/main/assets/language_list.txt similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/language_list.txt rename to app_solcraftlauncher/src/main/assets/language_list.txt diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/launcher_profiles.json b/app_solcraftlauncher/src/main/assets/launcher_profiles.json similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/launcher_profiles.json rename to app_solcraftlauncher/src/main/assets/launcher_profiles.json diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/options.txt b/app_solcraftlauncher/src/main/assets/options.txt similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/options.txt rename to app_solcraftlauncher/src/main/assets/options.txt diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/pojavlauncher.png b/app_solcraftlauncher/src/main/assets/pojavlauncher.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/pojavlauncher.png rename to app_solcraftlauncher/src/main/assets/pojavlauncher.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/pojavtext.png b/app_solcraftlauncher/src/main/assets/pojavtext.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/pojavtext.png rename to app_solcraftlauncher/src/main/assets/pojavtext.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/assets/resolv.conf b/app_solcraftlauncher/src/main/assets/resolv.conf similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/assets/resolv.conf rename to app_solcraftlauncher/src/main/assets/resolv.conf diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/ipaulpro/afilechooser/FileListAdapter.java b/app_solcraftlauncher/src/main/java/com/ipaulpro/afilechooser/FileListAdapter.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/ipaulpro/afilechooser/FileListAdapter.java rename to app_solcraftlauncher/src/main/java/com/ipaulpro/afilechooser/FileListAdapter.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/DefocusableScrollView.java b/app_solcraftlauncher/src/main/java/com/kdt/DefocusableScrollView.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/DefocusableScrollView.java rename to app_solcraftlauncher/src/main/java/com/kdt/DefocusableScrollView.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/LoggerView.java b/app_solcraftlauncher/src/main/java/com/kdt/LoggerView.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/LoggerView.java rename to app_solcraftlauncher/src/main/java/com/kdt/LoggerView.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/SimpleArrayAdapter.java b/app_solcraftlauncher/src/main/java/com/kdt/SimpleArrayAdapter.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/SimpleArrayAdapter.java rename to app_solcraftlauncher/src/main/java/com/kdt/SimpleArrayAdapter.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/LauncherMenuButton.java b/app_solcraftlauncher/src/main/java/com/kdt/mcgui/LauncherMenuButton.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/LauncherMenuButton.java rename to app_solcraftlauncher/src/main/java/com/kdt/mcgui/LauncherMenuButton.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineButton.java b/app_solcraftlauncher/src/main/java/com/kdt/mcgui/MineButton.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineButton.java rename to app_solcraftlauncher/src/main/java/com/kdt/mcgui/MineButton.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineEditText.java b/app_solcraftlauncher/src/main/java/com/kdt/mcgui/MineEditText.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineEditText.java rename to app_solcraftlauncher/src/main/java/com/kdt/mcgui/MineEditText.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/ProgressLayout.java b/app_solcraftlauncher/src/main/java/com/kdt/mcgui/ProgressLayout.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/ProgressLayout.java rename to app_solcraftlauncher/src/main/java/com/kdt/mcgui/ProgressLayout.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/TextProgressBar.java b/app_solcraftlauncher/src/main/java/com/kdt/mcgui/TextProgressBar.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/TextProgressBar.java rename to app_solcraftlauncher/src/main/java/com/kdt/mcgui/TextProgressBar.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcAccountSpinner.java b/app_solcraftlauncher/src/main/java/com/kdt/mcgui/mcAccountSpinner.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcAccountSpinner.java rename to app_solcraftlauncher/src/main/java/com/kdt/mcgui/mcAccountSpinner.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcVersionSpinner.java b/app_solcraftlauncher/src/main/java/com/kdt/mcgui/mcVersionSpinner.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/mcgui/mcVersionSpinner.java rename to app_solcraftlauncher/src/main/java/com/kdt/mcgui/mcVersionSpinner.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/pickafile/DialogTitleListener.java b/app_solcraftlauncher/src/main/java/com/kdt/pickafile/DialogTitleListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/pickafile/DialogTitleListener.java rename to app_solcraftlauncher/src/main/java/com/kdt/pickafile/DialogTitleListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/pickafile/FileListView.java b/app_solcraftlauncher/src/main/java/com/kdt/pickafile/FileListView.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/pickafile/FileListView.java rename to app_solcraftlauncher/src/main/java/com/kdt/pickafile/FileListView.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/pickafile/FileSelectedListener.java b/app_solcraftlauncher/src/main/java/com/kdt/pickafile/FileSelectedListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/pickafile/FileSelectedListener.java rename to app_solcraftlauncher/src/main/java/com/kdt/pickafile/FileSelectedListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/pickafile/SortFileName.java b/app_solcraftlauncher/src/main/java/com/kdt/pickafile/SortFileName.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/kdt/pickafile/SortFileName.java rename to app_solcraftlauncher/src/main/java/com/kdt/pickafile/SortFileName.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/com/oracle/dalvik/VMLauncher.java b/app_solcraftlauncher/src/main/java/com/oracle/dalvik/VMLauncher.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/com/oracle/dalvik/VMLauncher.java rename to app_solcraftlauncher/src/main/java/com/oracle/dalvik/VMLauncher.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/dalvik/annotation/optimization/CriticalNative.java b/app_solcraftlauncher/src/main/java/dalvik/annotation/optimization/CriticalNative.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/dalvik/annotation/optimization/CriticalNative.java rename to app_solcraftlauncher/src/main/java/dalvik/annotation/optimization/CriticalNative.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AWTCanvasView.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/AWTCanvasView.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AWTCanvasView.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/AWTCanvasView.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AWTInputBridge.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/AWTInputBridge.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AWTInputBridge.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/AWTInputBridge.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AWTInputEvent.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/AWTInputEvent.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/AWTInputEvent.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/AWTInputEvent.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Architecture.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/Architecture.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Architecture.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/Architecture.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseActivity.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/BaseActivity.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseActivity.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/BaseActivity.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CriticalNativeTest.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/CriticalNativeTest.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CriticalNativeTest.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/CriticalNativeTest.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/CustomControlsActivity.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/EfficientAndroidLWJGLKeycode.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/EfficientAndroidLWJGLKeycode.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/EfficientAndroidLWJGLKeycode.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/EfficientAndroidLWJGLKeycode.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/ExitActivity.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/ExitActivity.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/ExitActivity.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/ExitActivity.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/FatalErrorActivity.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/GrabListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/GrabListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/GrabListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/GrabListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/GyroControl.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/GyroControl.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/GyroControl.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/GyroControl.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/ImportControlActivity.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/ImportControlActivity.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/ImportControlActivity.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/ImportControlActivity.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/JAssetInfo.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/JAssets.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/JMinecraftVersionList.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JRE17Util.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/JRE17Util.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JRE17Util.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/JRE17Util.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/LauncherActivity.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/LauncherActivity.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/LauncherActivity.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/LauncherActivity.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/Logger.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/LwjglGlfwKeycode.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/LwjglGlfwKeycode.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/LwjglGlfwKeycode.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/LwjglGlfwKeycode.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLSurface.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLSurface.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLSurface.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLSurface.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MissingStorageActivity.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/MissingStorageActivity.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MissingStorageActivity.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/MissingStorageActivity.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavApplication.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/PojavApplication.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavApplication.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/PojavApplication.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavProfile.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/PojavProfile.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavProfile.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/PojavProfile.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/ShowErrorActivity.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/ShowErrorActivity.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/ShowErrorActivity.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/ShowErrorActivity.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/SingleTapConfirm.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/SingleTapConfirm.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/SingleTapConfirm.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/SingleTapConfirm.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/TapDetector.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/TapDetector.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/TapDetector.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/TapDetector.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/TestStorageActivity.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/TestStorageActivity.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/TestStorageActivity.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/TestStorageActivity.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Touchpad.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/Touchpad.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Touchpad.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/Touchpad.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/DoneListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/DoneListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/DoneListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/DoneListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/ErrorListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/ErrorListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/ErrorListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/ErrorListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/ProgressListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/ProgressListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/ProgressListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/listener/ProgressListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftBackgroundLogin.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftBackgroundLogin.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftBackgroundLogin.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftBackgroundLogin.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/PresentedException.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/PresentedException.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/PresentedException.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/PresentedException.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/AlphaSelectionListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/AlphaSelectionListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/AlphaSelectionListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/AlphaSelectionListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/AlphaView.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/AlphaView.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/AlphaView.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/AlphaView.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSelectionListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSelectionListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSelectionListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSelectionListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSelector.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSelector.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSelector.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSelector.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSideBySideView.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSideBySideView.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSideBySideView.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/ColorSideBySideView.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/HueSelectionListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/HueSelectionListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/HueSelectionListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/HueSelectionListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/HueView.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/HueView.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/HueView.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/HueView.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/RectangleSelectionListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/RectangleSelectionListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/RectangleSelectionListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/RectangleSelectionListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/SVRectangleView.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/SVRectangleView.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/SVRectangleView.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/colorselector/SVRectangleView.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/contracts/OpenDocumentWithExtension.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/contracts/OpenDocumentWithExtension.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/contracts/OpenDocumentWithExtension.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/contracts/OpenDocumentWithExtension.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButtonMenuListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButtonMenuListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButtonMenuListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButtonMenuListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawerData.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawerData.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawerData.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawerData.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlJoystickData.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlJoystickData.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlJoystickData.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlJoystickData.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/CustomControls.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/CustomControls.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/CustomControls.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/CustomControls.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/EditorExitable.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/EditorExitable.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/EditorExitable.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/EditorExitable.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/LayoutConverter.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/LayoutConverter.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/LayoutConverter.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/LayoutConverter.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlDrawer.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlDrawer.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlDrawer.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlDrawer.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlInterface.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlInterface.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlInterface.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlInterface.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlJoystick.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlJoystick.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlJoystick.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlJoystick.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadButton.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadButton.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadButton.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadButton.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadDpad.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadDpad.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadDpad.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadDpad.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadJoystick.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadJoystick.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadJoystick.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadJoystick.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadMap.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadMap.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadMap.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/GamepadMap.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionButtonInterface.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionButtonInterface.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionButtonInterface.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionButtonInterface.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionRow.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionRow.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionRow.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ActionRow.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/AddSubButton.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/AddSubButton.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/AddSubButton.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/AddSubButton.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/CloneButton.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/CloneButton.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/CloneButton.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/CloneButton.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ControlHandleView.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ControlHandleView.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ControlHandleView.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/ControlHandleView.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DeleteButton.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DeleteButton.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DeleteButton.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DeleteButton.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DrawerPullButton.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DrawerPullButton.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DrawerPullButton.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DrawerPullButton.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlPopup.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlPopup.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlPopup.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlPopup.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/AwtCharSender.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/AwtCharSender.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/AwtCharSender.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/AwtCharSender.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/CharacterSenderStrategy.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/CharacterSenderStrategy.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/CharacterSenderStrategy.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/CharacterSenderStrategy.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/LwjglCharSender.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/LwjglCharSender.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/LwjglCharSender.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/LwjglCharSender.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/TouchCharInput.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/TouchCharInput.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/TouchCharInput.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/keyboard/TouchCharInput.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraConstants.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraConstants.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraConstants.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraConstants.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraCore.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraCore.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraCore.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraCore.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/extra/ExtraListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FabricInstallFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FabricInstallFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FabricInstallFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FabricInstallFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FabriclikeInstallFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FabriclikeInstallFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FabriclikeInstallFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FabriclikeInstallFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FileSelectorFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FileSelectorFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FileSelectorFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/FileSelectorFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ForgeInstallFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ForgeInstallFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ForgeInstallFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ForgeInstallFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MainMenuFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MainMenuFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MainMenuFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MainMenuFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MicrosoftLoginFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MicrosoftLoginFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MicrosoftLoginFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/MicrosoftLoginFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ModVersionListFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ModVersionListFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ModVersionListFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ModVersionListFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/OptiFineInstallFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/OptiFineInstallFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/OptiFineInstallFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/OptiFineInstallFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileEditorFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileEditorFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileEditorFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileEditorFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileTypeSelectFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileTypeSelectFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileTypeSelectFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileTypeSelectFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/QuiltInstallFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/QuiltInstallFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/QuiltInstallFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/QuiltInstallFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SearchModFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SearchModFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SearchModFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SearchModFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SelectAuthFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SelectAuthFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SelectAuthFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/fragments/SelectAuthFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/BitmapCropBehaviour.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/BitmapCropBehaviour.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/BitmapCropBehaviour.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/BitmapCropBehaviour.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/CropperBehaviour.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/CropperBehaviour.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/CropperBehaviour.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/CropperBehaviour.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/CropperView.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/CropperView.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/CropperView.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/CropperView.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/RegionDecoderCropBehaviour.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/RegionDecoderCropBehaviour.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/RegionDecoderCropBehaviour.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/RegionDecoderCropBehaviour.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextAwareDoneListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextAwareDoneListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextAwareDoneListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextAwareDoneListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextExecutor.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextExecutor.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextExecutor.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextExecutor.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextExecutorTask.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextExecutorTask.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextExecutorTask.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/ContextExecutorTask.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/LifecycleAwareAlertDialog.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/LifecycleAwareAlertDialog.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/LifecycleAwareAlertDialog.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/lifecycle/LifecycleAwareAlertDialog.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/mirrors/DownloadMirror.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/mirrors/DownloadMirror.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/mirrors/DownloadMirror.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/mirrors/DownloadMirror.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/mirrors/MirrorTamperedException.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/mirrors/MirrorTamperedException.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/mirrors/MirrorTamperedException.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/mirrors/MirrorTamperedException.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabricVersion.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabricVersion.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabricVersion.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabricVersion.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabriclikeDownloadTask.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabriclikeDownloadTask.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabriclikeDownloadTask.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabriclikeDownloadTask.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabriclikeUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabriclikeUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabriclikeUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/FabriclikeUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeDownloadTask.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeDownloadTask.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeDownloadTask.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeDownloadTask.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeVersionListAdapter.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeVersionListAdapter.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeVersionListAdapter.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeVersionListAdapter.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeVersionListHandler.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeVersionListHandler.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeVersionListHandler.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ForgeVersionListHandler.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ModloaderDownloadListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ModloaderDownloadListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ModloaderDownloadListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ModloaderDownloadListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ModloaderListenerProxy.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ModloaderListenerProxy.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ModloaderListenerProxy.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/ModloaderListenerProxy.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OFDownloadPageScraper.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OFDownloadPageScraper.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OFDownloadPageScraper.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OFDownloadPageScraper.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineDownloadTask.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineDownloadTask.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineDownloadTask.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineDownloadTask.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineScraper.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineScraper.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineScraper.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineScraper.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineVersionListAdapter.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineVersionListAdapter.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineVersionListAdapter.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/OptiFineVersionListAdapter.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/ModItemAdapter.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/ModItemAdapter.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/ModItemAdapter.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/ModItemAdapter.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/ModloaderInstallTracker.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/ModloaderInstallTracker.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/ModloaderInstallTracker.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/ModloaderInstallTracker.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/SelfReferencingFuture.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/SelfReferencingFuture.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/SelfReferencingFuture.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/SelfReferencingFuture.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ApiHandler.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ApiHandler.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ApiHandler.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ApiHandler.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/CommonApi.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/CommonApi.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/CommonApi.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/CommonApi.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/CurseforgeApi.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/CurseforgeApi.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/CurseforgeApi.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/CurseforgeApi.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModDownloader.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModDownloader.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModDownloader.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModDownloader.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModLoader.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModLoader.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModLoader.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModLoader.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModpackApi.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModpackApi.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModpackApi.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModpackApi.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModpackInstaller.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModpackInstaller.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModpackInstaller.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModpackInstaller.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModrinthApi.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModrinthApi.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModrinthApi.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/ModrinthApi.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/NotificationDownloadListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/NotificationDownloadListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/NotificationDownloadListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/api/NotificationDownloadListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/DownloadImageTask.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/DownloadImageTask.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/DownloadImageTask.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/DownloadImageTask.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/IconCacheJanitor.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/IconCacheJanitor.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/IconCacheJanitor.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/IconCacheJanitor.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ImageReceiver.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ImageReceiver.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ImageReceiver.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ImageReceiver.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ModIconCache.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ModIconCache.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ModIconCache.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ModIconCache.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ReadFromDiskTask.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ReadFromDiskTask.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ReadFromDiskTask.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/imagecache/ReadFromDiskTask.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/Constants.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/Constants.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/Constants.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/Constants.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/CurseManifest.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/CurseManifest.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/CurseManifest.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/CurseManifest.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModDetail.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModDetail.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModDetail.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModDetail.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModItem.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModItem.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModItem.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModItem.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModSource.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModSource.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModSource.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModSource.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModrinthIndex.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModrinthIndex.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModrinthIndex.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/ModrinthIndex.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/SearchFilters.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/SearchFilters.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/SearchFilters.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/SearchFilters.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/SearchResult.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/SearchResult.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/SearchResult.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/modloaders/modpacks/models/SearchResult.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTConfigDialog.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTConfigDialog.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTConfigDialog.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTConfigDialog.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/multirt/MultiRTUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTRecyclerViewAdapter.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTRecyclerViewAdapter.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTRecyclerViewAdapter.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTRecyclerViewAdapter.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTSpinnerAdapter.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTSpinnerAdapter.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTSpinnerAdapter.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTSpinnerAdapter.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/Runtime.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/multirt/Runtime.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/Runtime.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/multirt/Runtime.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/plugins/FFmpegPlugin.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/plugins/FFmpegPlugin.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/plugins/FFmpegPlugin.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/plugins/FFmpegPlugin.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/BackButtonPreference.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/BackButtonPreference.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/BackButtonPreference.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/BackButtonPreference.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/CustomSeekBarPreference.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/CustomSeekBarPreference.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/CustomSeekBarPreference.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/CustomSeekBarPreference.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/GamepadRemapPreference.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/GamepadRemapPreference.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/GamepadRemapPreference.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/GamepadRemapPreference.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceControlFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceControlFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceControlFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceControlFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceExperimentalFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceExperimentalFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceExperimentalFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceExperimentalFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceJavaFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceJavaFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceJavaFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceJavaFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceMiscellaneousFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceMiscellaneousFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceMiscellaneousFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceMiscellaneousFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceVideoFragment.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceVideoFragment.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceVideoFragment.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/prefs/screens/LauncherPreferenceVideoFragment.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileAdapter.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileAdapter.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileAdapter.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileAdapter.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileAdapterExtra.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileAdapterExtra.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileAdapterExtra.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileAdapterExtra.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileIconCache.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileIconCache.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileIconCache.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileIconCache.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionListAdapter.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionListAdapter.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionListAdapter.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionListAdapter.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionSelectorDialog.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionSelectorDialog.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionSelectorDialog.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionSelectorDialog.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionSelectorListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionSelectorListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionSelectorListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/profiles/VersionSelectorListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/DownloaderProgressWrapper.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/DownloaderProgressWrapper.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/DownloaderProgressWrapper.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/DownloaderProgressWrapper.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressKeeper.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressKeeper.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressKeeper.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressKeeper.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressState.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressState.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressState.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/ProgressState.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/TaskCountListener.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/TaskCountListener.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/TaskCountListener.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/progresskeeper/TaskCountListener.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/scoped/FolderProvider.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/scoped/FolderProvider.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/scoped/FolderProvider.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/scoped/FolderProvider.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/services/GameService.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/services/GameService.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/services/GameService.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/services/GameService.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/services/ProgressService.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/services/ProgressService.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/services/ProgressService.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/services/ProgressService.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/services/ProgressServiceKeeper.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/services/ProgressServiceKeeper.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/services/ProgressServiceKeeper.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/services/ProgressServiceKeeper.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncAssetManager.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncAssetManager.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncAssetManager.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncAssetManager.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncMinecraftDownloader.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncMinecraftDownloader.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncMinecraftDownloader.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncMinecraftDownloader.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncVersionList.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncVersionList.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncVersionList.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncVersionList.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/CropperUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/CropperUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/CropperUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/CropperUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/DateUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/DateUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/DateUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/DateUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/DownloadUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/FileUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/FileUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/FileUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/FileUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/FilteredSubList.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/FilteredSubList.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/FilteredSubList.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/FilteredSubList.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/GsonJsonUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/GsonJsonUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/GsonJsonUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/GsonJsonUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JSONUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/JSONUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JSONUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/JSONUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/LocaleUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/LocaleUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/LocaleUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/LocaleUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/MCOptionUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/MCOptionUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/MCOptionUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/MCOptionUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/MathUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/MathUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/MathUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/MathUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/MatrixUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/MatrixUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/MatrixUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/MatrixUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/NotificationUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/NotificationUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/NotificationUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/NotificationUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/OldVersionsUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/OldVersionsUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/OldVersionsUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/OldVersionsUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/ZipUtils.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/ZipUtils.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/ZipUtils.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/utils/ZipUtils.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftClientInfo.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftLibraryArtifact.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/LauncherProfiles.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftAuthenticationDatabase.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherProfiles.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftLauncherSettings.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftProfile.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftResolution.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java b/app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java rename to app_solcraftlauncher/src/main/java/net/kdt/pojavlaunch/value/launcherprofiles/MinecraftSelectedUser.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/app_solcraftlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java rename to app_solcraftlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/Android.mk b/app_solcraftlauncher/src/main/jni/Android.mk similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/Android.mk rename to app_solcraftlauncher/src/main/jni/Android.mk diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/Application.mk b/app_solcraftlauncher/src/main/jni/Application.mk similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/Application.mk rename to app_solcraftlauncher/src/main/jni/Application.mk diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/GL/gl.h b/app_solcraftlauncher/src/main/jni/GL/gl.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/GL/gl.h rename to app_solcraftlauncher/src/main/jni/GL/gl.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/GL/glext.h b/app_solcraftlauncher/src/main/jni/GL/glext.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/GL/glext.h rename to app_solcraftlauncher/src/main/jni/GL/glext.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/GL/osmesa.h b/app_solcraftlauncher/src/main/jni/GL/osmesa.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/GL/osmesa.h rename to app_solcraftlauncher/src/main/jni/GL/osmesa.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/awt_bridge.c b/app_solcraftlauncher/src/main/jni/awt_bridge.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/awt_bridge.c rename to app_solcraftlauncher/src/main/jni/awt_bridge.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/awt_xawt/xawt_fake.c b/app_solcraftlauncher/src/main/jni/awt_xawt/xawt_fake.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/awt_xawt/xawt_fake.c rename to app_solcraftlauncher/src/main/jni/awt_xawt/xawt_fake.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/bigcoreaffinity.c b/app_solcraftlauncher/src/main/jni/bigcoreaffinity.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/bigcoreaffinity.c rename to app_solcraftlauncher/src/main/jni/bigcoreaffinity.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/bridge_tbl.h b/app_solcraftlauncher/src/main/jni/ctxbridges/bridge_tbl.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/bridge_tbl.h rename to app_solcraftlauncher/src/main/jni/ctxbridges/bridge_tbl.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/common.h b/app_solcraftlauncher/src/main/jni/ctxbridges/common.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/common.h rename to app_solcraftlauncher/src/main/jni/ctxbridges/common.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/egl_loader.c b/app_solcraftlauncher/src/main/jni/ctxbridges/egl_loader.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/egl_loader.c rename to app_solcraftlauncher/src/main/jni/ctxbridges/egl_loader.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/egl_loader.h b/app_solcraftlauncher/src/main/jni/ctxbridges/egl_loader.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/egl_loader.h rename to app_solcraftlauncher/src/main/jni/ctxbridges/egl_loader.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/gl_bridge.c b/app_solcraftlauncher/src/main/jni/ctxbridges/gl_bridge.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/gl_bridge.c rename to app_solcraftlauncher/src/main/jni/ctxbridges/gl_bridge.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/gl_bridge.h b/app_solcraftlauncher/src/main/jni/ctxbridges/gl_bridge.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/gl_bridge.h rename to app_solcraftlauncher/src/main/jni/ctxbridges/gl_bridge.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/osm_bridge.c b/app_solcraftlauncher/src/main/jni/ctxbridges/osm_bridge.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/osm_bridge.c rename to app_solcraftlauncher/src/main/jni/ctxbridges/osm_bridge.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/osm_bridge.h b/app_solcraftlauncher/src/main/jni/ctxbridges/osm_bridge.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/osm_bridge.h rename to app_solcraftlauncher/src/main/jni/ctxbridges/osm_bridge.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/osmesa_loader.c b/app_solcraftlauncher/src/main/jni/ctxbridges/osmesa_loader.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/osmesa_loader.c rename to app_solcraftlauncher/src/main/jni/ctxbridges/osmesa_loader.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/osmesa_loader.h b/app_solcraftlauncher/src/main/jni/ctxbridges/osmesa_loader.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/osmesa_loader.h rename to app_solcraftlauncher/src/main/jni/ctxbridges/osmesa_loader.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/swap_interval_no_egl.c b/app_solcraftlauncher/src/main/jni/ctxbridges/swap_interval_no_egl.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/ctxbridges/swap_interval_no_egl.c rename to app_solcraftlauncher/src/main/jni/ctxbridges/swap_interval_no_egl.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/driver_helper/hook.c b/app_solcraftlauncher/src/main/jni/driver_helper/hook.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/driver_helper/hook.c rename to app_solcraftlauncher/src/main/jni/driver_helper/hook.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/driver_helper/nsbypass.c b/app_solcraftlauncher/src/main/jni/driver_helper/nsbypass.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/driver_helper/nsbypass.c rename to app_solcraftlauncher/src/main/jni/driver_helper/nsbypass.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/driver_helper/nsbypass.h b/app_solcraftlauncher/src/main/jni/driver_helper/nsbypass.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/driver_helper/nsbypass.h rename to app_solcraftlauncher/src/main/jni/driver_helper/nsbypass.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/egl_bridge.c b/app_solcraftlauncher/src/main/jni/egl_bridge.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/egl_bridge.c rename to app_solcraftlauncher/src/main/jni/egl_bridge.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/environ/environ.c b/app_solcraftlauncher/src/main/jni/environ/environ.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/environ/environ.c rename to app_solcraftlauncher/src/main/jni/environ/environ.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/environ/environ.h b/app_solcraftlauncher/src/main/jni/environ/environ.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/environ/environ.h rename to app_solcraftlauncher/src/main/jni/environ/environ.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/input_bridge_v3.c b/app_solcraftlauncher/src/main/jni/input_bridge_v3.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/input_bridge_v3.c rename to app_solcraftlauncher/src/main/jni/input_bridge_v3.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/jre_launcher.c b/app_solcraftlauncher/src/main/jni/jre_launcher.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/jre_launcher.c rename to app_solcraftlauncher/src/main/jni/jre_launcher.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/log.h b/app_solcraftlauncher/src/main/jni/log.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/log.h rename to app_solcraftlauncher/src/main/jni/log.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/stdio_is.c b/app_solcraftlauncher/src/main/jni/stdio_is.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/stdio_is.c rename to app_solcraftlauncher/src/main/jni/stdio_is.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/angle-gles/arm64-v8a/libGLESv2_angle.so b/app_solcraftlauncher/src/main/jni/tinywrapper/angle-gles/arm64-v8a/libGLESv2_angle.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/angle-gles/arm64-v8a/libGLESv2_angle.so rename to app_solcraftlauncher/src/main/jni/tinywrapper/angle-gles/arm64-v8a/libGLESv2_angle.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/angle-gles/armeabi-v7a/libGLESv2_angle.so b/app_solcraftlauncher/src/main/jni/tinywrapper/angle-gles/armeabi-v7a/libGLESv2_angle.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/angle-gles/armeabi-v7a/libGLESv2_angle.so rename to app_solcraftlauncher/src/main/jni/tinywrapper/angle-gles/armeabi-v7a/libGLESv2_angle.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/angle-gles/x86/libGLESv2_angle.so b/app_solcraftlauncher/src/main/jni/tinywrapper/angle-gles/x86/libGLESv2_angle.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/angle-gles/x86/libGLESv2_angle.so rename to app_solcraftlauncher/src/main/jni/tinywrapper/angle-gles/x86/libGLESv2_angle.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/angle-gles/x86_64/libGLESv2_angle.so b/app_solcraftlauncher/src/main/jni/tinywrapper/angle-gles/x86_64/libGLESv2_angle.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/angle-gles/x86_64/libGLESv2_angle.so rename to app_solcraftlauncher/src/main/jni/tinywrapper/angle-gles/x86_64/libGLESv2_angle.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/main.c b/app_solcraftlauncher/src/main/jni/tinywrapper/main.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/main.c rename to app_solcraftlauncher/src/main/jni/tinywrapper/main.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/string_utils.c b/app_solcraftlauncher/src/main/jni/tinywrapper/string_utils.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/string_utils.c rename to app_solcraftlauncher/src/main/jni/tinywrapper/string_utils.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/string_utils.h b/app_solcraftlauncher/src/main/jni/tinywrapper/string_utils.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/tinywrapper/string_utils.h rename to app_solcraftlauncher/src/main/jni/tinywrapper/string_utils.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/utils.c b/app_solcraftlauncher/src/main/jni/utils.c similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/utils.c rename to app_solcraftlauncher/src/main/jni/utils.c diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jni/utils.h b/app_solcraftlauncher/src/main/jni/utils.h similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jni/utils.h rename to app_solcraftlauncher/src/main/jni/utils.h diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libEGL_angle.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libEGL_angle.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libEGL_angle.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libEGL_angle.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libOSMesa.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libOSMesa.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libOSMesa.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libOSMesa.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libVkLayer_khronos_timeline_semaphore.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libVkLayer_khronos_timeline_semaphore.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libVkLayer_khronos_timeline_semaphore.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libVkLayer_khronos_timeline_semaphore.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libgl4es_114.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libjnidispatch.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libjnidispatch.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libjnidispatch.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libjnidispatch.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/liblwjgl.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/liblwjgl.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libopenal.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libopenal.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libopenal.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libopenal.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libunpack200.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libunpack200.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libunpack200.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libunpack200.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libvulkan_freedreno.so b/app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libvulkan_freedreno.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libvulkan_freedreno.so rename to app_solcraftlauncher/src/main/jniLibs/arm64-v8a/libvulkan_freedreno.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libEGL_angle.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libEGL_angle.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libEGL_angle.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libEGL_angle.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libOSMesa.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libOSMesa.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libOSMesa.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libOSMesa.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libgl4es_114.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libjnidispatch.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libjnidispatch.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libjnidispatch.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libjnidispatch.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_nanovg.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_nanovg.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_nanovg.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_nanovg.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_opengl.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_opengl.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_opengl.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_opengl.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_stb.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_stb.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_stb.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_stb.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_tinyfd.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_tinyfd.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_tinyfd.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_tinyfd.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libopenal.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libopenal.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libopenal.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libopenal.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libtwitchsdk.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libtwitchsdk.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libtwitchsdk.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libtwitchsdk.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libunpack200.so b/app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libunpack200.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libunpack200.so rename to app_solcraftlauncher/src/main/jniLibs/armeabi-v7a/libunpack200.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/libEGL_angle.so b/app_solcraftlauncher/src/main/jniLibs/x86/libEGL_angle.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/libEGL_angle.so rename to app_solcraftlauncher/src/main/jniLibs/x86/libEGL_angle.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/libgl4es_114.so b/app_solcraftlauncher/src/main/jniLibs/x86/libgl4es_114.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/libgl4es_114.so rename to app_solcraftlauncher/src/main/jniLibs/x86/libgl4es_114.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/libjnidispatch.so b/app_solcraftlauncher/src/main/jniLibs/x86/libjnidispatch.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/libjnidispatch.so rename to app_solcraftlauncher/src/main/jniLibs/x86/libjnidispatch.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl.so b/app_solcraftlauncher/src/main/jniLibs/x86/liblwjgl.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl.so rename to app_solcraftlauncher/src/main/jniLibs/x86/liblwjgl.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_nanovg.so b/app_solcraftlauncher/src/main/jniLibs/x86/liblwjgl_nanovg.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_nanovg.so rename to app_solcraftlauncher/src/main/jniLibs/x86/liblwjgl_nanovg.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_opengl.so b/app_solcraftlauncher/src/main/jniLibs/x86/liblwjgl_opengl.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_opengl.so rename to app_solcraftlauncher/src/main/jniLibs/x86/liblwjgl_opengl.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_stb.so b/app_solcraftlauncher/src/main/jniLibs/x86/liblwjgl_stb.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_stb.so rename to app_solcraftlauncher/src/main/jniLibs/x86/liblwjgl_stb.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_tinyfd.so b/app_solcraftlauncher/src/main/jniLibs/x86/liblwjgl_tinyfd.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_tinyfd.so rename to app_solcraftlauncher/src/main/jniLibs/x86/liblwjgl_tinyfd.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/libopenal.so b/app_solcraftlauncher/src/main/jniLibs/x86/libopenal.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/libopenal.so rename to app_solcraftlauncher/src/main/jniLibs/x86/libopenal.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/libunpack200.so b/app_solcraftlauncher/src/main/jniLibs/x86/libunpack200.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86/libunpack200.so rename to app_solcraftlauncher/src/main/jniLibs/x86/libunpack200.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libEGL_angle.so b/app_solcraftlauncher/src/main/jniLibs/x86_64/libEGL_angle.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libEGL_angle.so rename to app_solcraftlauncher/src/main/jniLibs/x86_64/libEGL_angle.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libOSMesa.so b/app_solcraftlauncher/src/main/jniLibs/x86_64/libOSMesa.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libOSMesa.so rename to app_solcraftlauncher/src/main/jniLibs/x86_64/libOSMesa.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libgl4es_114.so b/app_solcraftlauncher/src/main/jniLibs/x86_64/libgl4es_114.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libgl4es_114.so rename to app_solcraftlauncher/src/main/jniLibs/x86_64/libgl4es_114.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libjnidispatch.so b/app_solcraftlauncher/src/main/jniLibs/x86_64/libjnidispatch.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libjnidispatch.so rename to app_solcraftlauncher/src/main/jniLibs/x86_64/libjnidispatch.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl.so b/app_solcraftlauncher/src/main/jniLibs/x86_64/liblwjgl.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl.so rename to app_solcraftlauncher/src/main/jniLibs/x86_64/liblwjgl.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_nanovg.so b/app_solcraftlauncher/src/main/jniLibs/x86_64/liblwjgl_nanovg.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_nanovg.so rename to app_solcraftlauncher/src/main/jniLibs/x86_64/liblwjgl_nanovg.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_opengl.so b/app_solcraftlauncher/src/main/jniLibs/x86_64/liblwjgl_opengl.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_opengl.so rename to app_solcraftlauncher/src/main/jniLibs/x86_64/liblwjgl_opengl.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_stb.so b/app_solcraftlauncher/src/main/jniLibs/x86_64/liblwjgl_stb.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_stb.so rename to app_solcraftlauncher/src/main/jniLibs/x86_64/liblwjgl_stb.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_tinyfd.so b/app_solcraftlauncher/src/main/jniLibs/x86_64/liblwjgl_tinyfd.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_tinyfd.so rename to app_solcraftlauncher/src/main/jniLibs/x86_64/liblwjgl_tinyfd.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libopenal.so b/app_solcraftlauncher/src/main/jniLibs/x86_64/libopenal.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libopenal.so rename to app_solcraftlauncher/src/main/jniLibs/x86_64/libopenal.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libunpack200.so b/app_solcraftlauncher/src/main/jniLibs/x86_64/libunpack200.so similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/jniLibs/x86_64/libunpack200.so rename to app_solcraftlauncher/src/main/jniLibs/x86_64/libunpack200.so diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_card.xml b/app_solcraftlauncher/src/main/res/drawable/background_card.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_card.xml rename to app_solcraftlauncher/src/main/res/drawable/background_card.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_control_editor.xml b/app_solcraftlauncher/src/main/res/drawable/background_control_editor.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_control_editor.xml rename to app_solcraftlauncher/src/main/res/drawable/background_control_editor.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_icon_edit.xml b/app_solcraftlauncher/src/main/res/drawable/background_icon_edit.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_icon_edit.xml rename to app_solcraftlauncher/src/main/res/drawable/background_icon_edit.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_line.xml b/app_solcraftlauncher/src/main/res/drawable/background_line.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_line.xml rename to app_solcraftlauncher/src/main/res/drawable/background_line.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_line_selected.xml b/app_solcraftlauncher/src/main/res/drawable/background_line_selected.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_line_selected.xml rename to app_solcraftlauncher/src/main/res/drawable/background_line_selected.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_line_unselected.xml b/app_solcraftlauncher/src/main/res/drawable/background_line_unselected.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_line_unselected.xml rename to app_solcraftlauncher/src/main/res/drawable/background_line_unselected.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_overlay.xml b/app_solcraftlauncher/src/main/res/drawable/background_overlay.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/background_overlay.xml rename to app_solcraftlauncher/src/main/res/drawable/background_overlay.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/control_button.xml b/app_solcraftlauncher/src/main/res/drawable/control_button.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/control_button.xml rename to app_solcraftlauncher/src/main/res/drawable/control_button.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/control_side_action_window.9.png b/app_solcraftlauncher/src/main/res/drawable/control_side_action_window.9.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/control_side_action_window.9.png rename to app_solcraftlauncher/src/main/res/drawable/control_side_action_window.9.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_add.xml b/app_solcraftlauncher/src/main/res/drawable/ic_add.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_add.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_add.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_add_modded.xml b/app_solcraftlauncher/src/main/res/drawable/ic_add_modded.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_add_modded.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_add_modded.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_arrow_back_white.xml b/app_solcraftlauncher/src/main/res/drawable/ic_arrow_back_white.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_arrow_back_white.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_arrow_back_white.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_curseforge.png b/app_solcraftlauncher/src/main/res/drawable/ic_curseforge.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_curseforge.png rename to app_solcraftlauncher/src/main/res/drawable/ic_curseforge.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_edit_profile.xml b/app_solcraftlauncher/src/main/res/drawable/ic_edit_profile.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_edit_profile.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_edit_profile.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_fabric.webp b/app_solcraftlauncher/src/main/res/drawable/ic_fabric.webp similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_fabric.webp rename to app_solcraftlauncher/src/main/res/drawable/ic_fabric.webp diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_file.xml b/app_solcraftlauncher/src/main/res/drawable/ic_file.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_file.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_file.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_filter.xml b/app_solcraftlauncher/src/main/res/drawable/ic_filter.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_filter.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_filter.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_folder.xml b/app_solcraftlauncher/src/main/res/drawable/ic_folder.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_folder.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_folder.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_gamepad_pointer.png b/app_solcraftlauncher/src/main/res/drawable/ic_gamepad_pointer.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_gamepad_pointer.png rename to app_solcraftlauncher/src/main/res/drawable/ic_gamepad_pointer.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_custom_controls.xml b/app_solcraftlauncher/src/main/res/drawable/ic_menu_custom_controls.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_custom_controls.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_menu_custom_controls.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_delete_forever.xml b/app_solcraftlauncher/src/main/res/drawable/ic_menu_delete_forever.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_delete_forever.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_menu_delete_forever.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_home.xml b/app_solcraftlauncher/src/main/res/drawable/ic_menu_home.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_home.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_menu_home.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_install_jar.xml b/app_solcraftlauncher/src/main/res/drawable/ic_menu_install_jar.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_install_jar.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_menu_install_jar.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_news.xml b/app_solcraftlauncher/src/main/res/drawable/ic_menu_news.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_news.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_menu_news.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_settings.xml b/app_solcraftlauncher/src/main/res/drawable/ic_menu_settings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_menu_settings.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_menu_settings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_modrinth.png b/app_solcraftlauncher/src/main/res/drawable/ic_modrinth.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_modrinth.png rename to app_solcraftlauncher/src/main/res/drawable/ic_modrinth.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_mouse_pointer.png b/app_solcraftlauncher/src/main/res/drawable/ic_mouse_pointer.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_mouse_pointer.png rename to app_solcraftlauncher/src/main/res/drawable/ic_mouse_pointer.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_pojav_full.webp b/app_solcraftlauncher/src/main/res/drawable/ic_pojav_full.webp similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_pojav_full.webp rename to app_solcraftlauncher/src/main/res/drawable/ic_pojav_full.webp diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_quilt.webp b/app_solcraftlauncher/src/main/res/drawable/ic_quilt.webp similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_quilt.webp rename to app_solcraftlauncher/src/main/res/drawable/ic_quilt.webp diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_control_scale.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_control_scale.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_control_scale.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_control_scale.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_engine.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_engine.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_engine.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_engine.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_gesture_disable.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_gesture_disable.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_gesture_disable.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_gesture_disable.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_gesture_time.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_gesture_time.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_gesture_time.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_gesture_time.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_hash_verification.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_hash_verification.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_hash_verification.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_hash_verification.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_hide_notch.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_hide_notch.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_hide_notch.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_hide_notch.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_java_runtime.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_java_runtime.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_java_runtime.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_java_runtime.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_misc.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_misc.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_misc.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_misc.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_mouse_speed.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_mouse_speed.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_mouse_speed.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_mouse_speed.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_pointer_scale.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_pointer_scale.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_pointer_scale.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_pointer_scale.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_ram.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_ram.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_ram.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_ram.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_screen_resolution.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_screen_resolution.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_screen_resolution.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_screen_resolution.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_sign_in_background.webp b/app_solcraftlauncher/src/main/res/drawable/ic_setting_sign_in_background.webp similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_sign_in_background.webp rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_sign_in_background.webp diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_video.xml b/app_solcraftlauncher/src/main/res/drawable/ic_setting_video.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_setting_video.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_setting_video.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_sharp_settings_24.xml b/app_solcraftlauncher/src/main/res/drawable/ic_sharp_settings_24.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_sharp_settings_24.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_sharp_settings_24.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_view_handle.xml b/app_solcraftlauncher/src/main/res/drawable/ic_view_handle.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/ic_view_handle.xml rename to app_solcraftlauncher/src/main/res/drawable/ic_view_handle.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/menu_background.xml b/app_solcraftlauncher/src/main/res/drawable/menu_background.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/menu_background.xml rename to app_solcraftlauncher/src/main/res/drawable/menu_background.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/mine_button_background.xml b/app_solcraftlauncher/src/main/res/drawable/mine_button_background.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/mine_button_background.xml rename to app_solcraftlauncher/src/main/res/drawable/mine_button_background.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/mine_button_focused.9.png b/app_solcraftlauncher/src/main/res/drawable/mine_button_focused.9.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/mine_button_focused.9.png rename to app_solcraftlauncher/src/main/res/drawable/mine_button_focused.9.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/mine_button_unfocused.9.png b/app_solcraftlauncher/src/main/res/drawable/mine_button_unfocused.9.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/mine_button_unfocused.9.png rename to app_solcraftlauncher/src/main/res/drawable/mine_button_unfocused.9.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/no_focus_shown.xml b/app_solcraftlauncher/src/main/res/drawable/no_focus_shown.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/no_focus_shown.xml rename to app_solcraftlauncher/src/main/res/drawable/no_focus_shown.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/notif_icon.xml b/app_solcraftlauncher/src/main/res/drawable/notif_icon.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/notif_icon.xml rename to app_solcraftlauncher/src/main/res/drawable/notif_icon.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/spinner_arrow.png b/app_solcraftlauncher/src/main/res/drawable/spinner_arrow.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/spinner_arrow.png rename to app_solcraftlauncher/src/main/res/drawable/spinner_arrow.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/spinner_arrow_right.png b/app_solcraftlauncher/src/main/res/drawable/spinner_arrow_right.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/spinner_arrow_right.png rename to app_solcraftlauncher/src/main/res/drawable/spinner_arrow_right.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/storage_alert.xml b/app_solcraftlauncher/src/main/res/drawable/storage_alert.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/storage_alert.xml rename to app_solcraftlauncher/src/main/res/drawable/storage_alert.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/view_text_progressbar.xml b/app_solcraftlauncher/src/main/res/drawable/view_text_progressbar.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/drawable/view_text_progressbar.xml rename to app_solcraftlauncher/src/main/res/drawable/view_text_progressbar.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/font/minecraft_ten.ttf b/app_solcraftlauncher/src/main/res/font/minecraft_ten.ttf similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/font/minecraft_ten.ttf rename to app_solcraftlauncher/src/main/res/font/minecraft_ten.ttf diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/font/noto_sans_bold.ttf b/app_solcraftlauncher/src/main/res/font/noto_sans_bold.ttf similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/font/noto_sans_bold.ttf rename to app_solcraftlauncher/src/main/res/font/noto_sans_bold.ttf diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout-land/activity_pojav_launcher.xml b/app_solcraftlauncher/src/main/res/layout-land/activity_pojav_launcher.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout-land/activity_pojav_launcher.xml rename to app_solcraftlauncher/src/main/res/layout-land/activity_pojav_launcher.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout-land/fragment_launcher.xml b/app_solcraftlauncher/src/main/res/layout-land/fragment_launcher.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout-land/fragment_launcher.xml rename to app_solcraftlauncher/src/main/res/layout-land/fragment_launcher.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/activity_basemain.xml b/app_solcraftlauncher/src/main/res/layout/activity_basemain.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/activity_basemain.xml rename to app_solcraftlauncher/src/main/res/layout/activity_basemain.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/activity_custom_controls.xml b/app_solcraftlauncher/src/main/res/layout/activity_custom_controls.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/activity_custom_controls.xml rename to app_solcraftlauncher/src/main/res/layout/activity_custom_controls.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/activity_import_control.xml b/app_solcraftlauncher/src/main/res/layout/activity_import_control.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/activity_import_control.xml rename to app_solcraftlauncher/src/main/res/layout/activity_import_control.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/activity_java_gui_launcher.xml b/app_solcraftlauncher/src/main/res/layout/activity_java_gui_launcher.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/activity_java_gui_launcher.xml rename to app_solcraftlauncher/src/main/res/layout/activity_java_gui_launcher.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/activity_pojav_launcher.xml b/app_solcraftlauncher/src/main/res/layout/activity_pojav_launcher.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/activity_pojav_launcher.xml rename to app_solcraftlauncher/src/main/res/layout/activity_pojav_launcher.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_color_selector.xml b/app_solcraftlauncher/src/main/res/layout/dialog_color_selector.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_color_selector.xml rename to app_solcraftlauncher/src/main/res/layout/dialog_color_selector.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_control_button_setting.xml b/app_solcraftlauncher/src/main/res/layout/dialog_control_button_setting.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_control_button_setting.xml rename to app_solcraftlauncher/src/main/res/layout/dialog_control_button_setting.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_cropper.xml b/app_solcraftlauncher/src/main/res/layout/dialog_cropper.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_cropper.xml rename to app_solcraftlauncher/src/main/res/layout/dialog_cropper.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_expendable_list_view.xml b/app_solcraftlauncher/src/main/res/layout/dialog_expendable_list_view.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_expendable_list_view.xml rename to app_solcraftlauncher/src/main/res/layout/dialog_expendable_list_view.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_live_mouse_speed_editor.xml b/app_solcraftlauncher/src/main/res/layout/dialog_live_mouse_speed_editor.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_live_mouse_speed_editor.xml rename to app_solcraftlauncher/src/main/res/layout/dialog_live_mouse_speed_editor.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_mod_filters.xml b/app_solcraftlauncher/src/main/res/layout/dialog_mod_filters.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_mod_filters.xml rename to app_solcraftlauncher/src/main/res/layout/dialog_mod_filters.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_per_version_control.xml b/app_solcraftlauncher/src/main/res/layout/dialog_per_version_control.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/dialog_per_version_control.xml rename to app_solcraftlauncher/src/main/res/layout/dialog_per_version_control.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_fabric_install.xml b/app_solcraftlauncher/src/main/res/layout/fragment_fabric_install.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_fabric_install.xml rename to app_solcraftlauncher/src/main/res/layout/fragment_fabric_install.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_file_selector.xml b/app_solcraftlauncher/src/main/res/layout/fragment_file_selector.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_file_selector.xml rename to app_solcraftlauncher/src/main/res/layout/fragment_file_selector.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_launcher.xml b/app_solcraftlauncher/src/main/res/layout/fragment_launcher.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_launcher.xml rename to app_solcraftlauncher/src/main/res/layout/fragment_launcher.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_local_login.xml b/app_solcraftlauncher/src/main/res/layout/fragment_local_login.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_local_login.xml rename to app_solcraftlauncher/src/main/res/layout/fragment_local_login.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_microsoft_login.xml b/app_solcraftlauncher/src/main/res/layout/fragment_microsoft_login.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_microsoft_login.xml rename to app_solcraftlauncher/src/main/res/layout/fragment_microsoft_login.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_mod_search.xml b/app_solcraftlauncher/src/main/res/layout/fragment_mod_search.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_mod_search.xml rename to app_solcraftlauncher/src/main/res/layout/fragment_mod_search.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_mod_version_list.xml b/app_solcraftlauncher/src/main/res/layout/fragment_mod_version_list.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_mod_version_list.xml rename to app_solcraftlauncher/src/main/res/layout/fragment_mod_version_list.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_profile_editor.xml b/app_solcraftlauncher/src/main/res/layout/fragment_profile_editor.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_profile_editor.xml rename to app_solcraftlauncher/src/main/res/layout/fragment_profile_editor.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_profile_type.xml b/app_solcraftlauncher/src/main/res/layout/fragment_profile_type.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_profile_type.xml rename to app_solcraftlauncher/src/main/res/layout/fragment_profile_type.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_select_auth_method.xml b/app_solcraftlauncher/src/main/res/layout/fragment_select_auth_method.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/fragment_select_auth_method.xml rename to app_solcraftlauncher/src/main/res/layout/fragment_select_auth_method.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/item_centered_textview.xml b/app_solcraftlauncher/src/main/res/layout/item_centered_textview.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/item_centered_textview.xml rename to app_solcraftlauncher/src/main/res/layout/item_centered_textview.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/item_minecraft_account.xml b/app_solcraftlauncher/src/main/res/layout/item_minecraft_account.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/item_minecraft_account.xml rename to app_solcraftlauncher/src/main/res/layout/item_minecraft_account.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/item_multirt_runtime.xml b/app_solcraftlauncher/src/main/res/layout/item_multirt_runtime.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/item_multirt_runtime.xml rename to app_solcraftlauncher/src/main/res/layout/item_multirt_runtime.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/item_simple_list_1.xml b/app_solcraftlauncher/src/main/res/layout/item_simple_list_1.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/item_simple_list_1.xml rename to app_solcraftlauncher/src/main/res/layout/item_simple_list_1.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/item_version_profile_layout.xml b/app_solcraftlauncher/src/main/res/layout/item_version_profile_layout.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/item_version_profile_layout.xml rename to app_solcraftlauncher/src/main/res/layout/item_version_profile_layout.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/spinner_mc_version.xml b/app_solcraftlauncher/src/main/res/layout/spinner_mc_version.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/spinner_mc_version.xml rename to app_solcraftlauncher/src/main/res/layout/spinner_mc_version.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/storage_test_no_sdcard.xml b/app_solcraftlauncher/src/main/res/layout/storage_test_no_sdcard.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/storage_test_no_sdcard.xml rename to app_solcraftlauncher/src/main/res/layout/storage_test_no_sdcard.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/view_loading.xml b/app_solcraftlauncher/src/main/res/layout/view_loading.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/view_loading.xml rename to app_solcraftlauncher/src/main/res/layout/view_loading.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/view_logger.xml b/app_solcraftlauncher/src/main/res/layout/view_logger.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/view_logger.xml rename to app_solcraftlauncher/src/main/res/layout/view_logger.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/view_mod.xml b/app_solcraftlauncher/src/main/res/layout/view_mod.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/view_mod.xml rename to app_solcraftlauncher/src/main/res/layout/view_mod.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/view_mod_extended.xml b/app_solcraftlauncher/src/main/res/layout/view_mod_extended.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/view_mod_extended.xml rename to app_solcraftlauncher/src/main/res/layout/view_mod_extended.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/view_progress.xml b/app_solcraftlauncher/src/main/res/layout/view_progress.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/layout/view_progress.xml rename to app_solcraftlauncher/src/main/res/layout/view_progress.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/menu/menu_customctrl.xml b/app_solcraftlauncher/src/main/res/menu/menu_customctrl.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/menu/menu_customctrl.xml rename to app_solcraftlauncher/src/main/res/menu/menu_customctrl.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/menu/menu_runopt.xml b/app_solcraftlauncher/src/main/res/menu/menu_runopt.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/menu/menu_runopt.xml rename to app_solcraftlauncher/src/main/res/menu/menu_runopt.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/menu/menu_versionopt.xml b/app_solcraftlauncher/src/main/res/menu/menu_versionopt.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/menu/menu_versionopt.xml rename to app_solcraftlauncher/src/main/res/menu/menu_versionopt.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app_solcraftlauncher/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to app_solcraftlauncher/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-hdpi/ic_launcher.png b/app_solcraftlauncher/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-hdpi/ic_launcher.png rename to app_solcraftlauncher/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app_solcraftlauncher/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to app_solcraftlauncher/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app_solcraftlauncher/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to app_solcraftlauncher/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-mdpi/ic_launcher.png b/app_solcraftlauncher/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-mdpi/ic_launcher.png rename to app_solcraftlauncher/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app_solcraftlauncher/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to app_solcraftlauncher/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app_solcraftlauncher/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to app_solcraftlauncher/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xhdpi/ic_launcher.png b/app_solcraftlauncher/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xhdpi/ic_launcher.png rename to app_solcraftlauncher/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app_solcraftlauncher/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to app_solcraftlauncher/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app_solcraftlauncher/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to app_solcraftlauncher/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app_solcraftlauncher/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to app_solcraftlauncher/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app_solcraftlauncher/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to app_solcraftlauncher/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app_solcraftlauncher/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to app_solcraftlauncher/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app_solcraftlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to app_solcraftlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app_solcraftlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to app_solcraftlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app_solcraftlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to app_solcraftlauncher/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-af/strings.xml b/app_solcraftlauncher/src/main/res/values-af/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-af/strings.xml rename to app_solcraftlauncher/src/main/res/values-af/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ar/strings.xml b/app_solcraftlauncher/src/main/res/values-ar/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ar/strings.xml rename to app_solcraftlauncher/src/main/res/values-ar/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-az-rAZ/strings.xml b/app_solcraftlauncher/src/main/res/values-az-rAZ/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-az-rAZ/strings.xml rename to app_solcraftlauncher/src/main/res/values-az-rAZ/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ba/strings.xml b/app_solcraftlauncher/src/main/res/values-ba/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ba/strings.xml rename to app_solcraftlauncher/src/main/res/values-ba/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-bn-rBD/strings.xml b/app_solcraftlauncher/src/main/res/values-bn-rBD/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-bn-rBD/strings.xml rename to app_solcraftlauncher/src/main/res/values-bn-rBD/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-bn-rIN/strings.xml b/app_solcraftlauncher/src/main/res/values-bn-rIN/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-bn-rIN/strings.xml rename to app_solcraftlauncher/src/main/res/values-bn-rIN/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ca/strings.xml b/app_solcraftlauncher/src/main/res/values-ca/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ca/strings.xml rename to app_solcraftlauncher/src/main/res/values-ca/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-cs/strings.xml b/app_solcraftlauncher/src/main/res/values-cs/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-cs/strings.xml rename to app_solcraftlauncher/src/main/res/values-cs/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-da/strings.xml b/app_solcraftlauncher/src/main/res/values-da/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-da/strings.xml rename to app_solcraftlauncher/src/main/res/values-da/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-de/strings.xml b/app_solcraftlauncher/src/main/res/values-de/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-de/strings.xml rename to app_solcraftlauncher/src/main/res/values-de/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-el/strings.xml b/app_solcraftlauncher/src/main/res/values-el/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-el/strings.xml rename to app_solcraftlauncher/src/main/res/values-el/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-en-rGB/strings.xml b/app_solcraftlauncher/src/main/res/values-en-rGB/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-en-rGB/strings.xml rename to app_solcraftlauncher/src/main/res/values-en-rGB/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-es/strings.xml b/app_solcraftlauncher/src/main/res/values-es/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-es/strings.xml rename to app_solcraftlauncher/src/main/res/values-es/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-et-rEE/strings.xml b/app_solcraftlauncher/src/main/res/values-et-rEE/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-et-rEE/strings.xml rename to app_solcraftlauncher/src/main/res/values-et-rEE/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-fa-rIR/strings.xml b/app_solcraftlauncher/src/main/res/values-fa-rIR/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-fa-rIR/strings.xml rename to app_solcraftlauncher/src/main/res/values-fa-rIR/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-fi/strings.xml b/app_solcraftlauncher/src/main/res/values-fi/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-fi/strings.xml rename to app_solcraftlauncher/src/main/res/values-fi/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-fil/strings.xml b/app_solcraftlauncher/src/main/res/values-fil/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-fil/strings.xml rename to app_solcraftlauncher/src/main/res/values-fil/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-fr/strings.xml b/app_solcraftlauncher/src/main/res/values-fr/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-fr/strings.xml rename to app_solcraftlauncher/src/main/res/values-fr/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-hi/strings.xml b/app_solcraftlauncher/src/main/res/values-hi/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-hi/strings.xml rename to app_solcraftlauncher/src/main/res/values-hi/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-hu/strings.xml b/app_solcraftlauncher/src/main/res/values-hu/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-hu/strings.xml rename to app_solcraftlauncher/src/main/res/values-hu/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-in/strings.xml b/app_solcraftlauncher/src/main/res/values-in/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-in/strings.xml rename to app_solcraftlauncher/src/main/res/values-in/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-it/strings.xml b/app_solcraftlauncher/src/main/res/values-it/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-it/strings.xml rename to app_solcraftlauncher/src/main/res/values-it/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-iw/strings.xml b/app_solcraftlauncher/src/main/res/values-iw/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-iw/strings.xml rename to app_solcraftlauncher/src/main/res/values-iw/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ja/strings.xml b/app_solcraftlauncher/src/main/res/values-ja/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ja/strings.xml rename to app_solcraftlauncher/src/main/res/values-ja/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-kk/strings.xml b/app_solcraftlauncher/src/main/res/values-kk/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-kk/strings.xml rename to app_solcraftlauncher/src/main/res/values-kk/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ko/strings.xml b/app_solcraftlauncher/src/main/res/values-ko/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ko/strings.xml rename to app_solcraftlauncher/src/main/res/values-ko/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-la/strings.xml b/app_solcraftlauncher/src/main/res/values-la/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-la/strings.xml rename to app_solcraftlauncher/src/main/res/values-la/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-land/styles.xml b/app_solcraftlauncher/src/main/res/values-land/styles.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-land/styles.xml rename to app_solcraftlauncher/src/main/res/values-land/styles.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-lol-rAA/strings.xml b/app_solcraftlauncher/src/main/res/values-lol-rAA/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-lol-rAA/strings.xml rename to app_solcraftlauncher/src/main/res/values-lol-rAA/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-lt/strings.xml b/app_solcraftlauncher/src/main/res/values-lt/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-lt/strings.xml rename to app_solcraftlauncher/src/main/res/values-lt/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-mn-rMN/strings.xml b/app_solcraftlauncher/src/main/res/values-mn-rMN/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-mn-rMN/strings.xml rename to app_solcraftlauncher/src/main/res/values-mn-rMN/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ms/strings.xml b/app_solcraftlauncher/src/main/res/values-ms/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ms/strings.xml rename to app_solcraftlauncher/src/main/res/values-ms/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-nl/strings.xml b/app_solcraftlauncher/src/main/res/values-nl/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-nl/strings.xml rename to app_solcraftlauncher/src/main/res/values-nl/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-no/strings.xml b/app_solcraftlauncher/src/main/res/values-no/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-no/strings.xml rename to app_solcraftlauncher/src/main/res/values-no/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-pl/strings.xml b/app_solcraftlauncher/src/main/res/values-pl/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-pl/strings.xml rename to app_solcraftlauncher/src/main/res/values-pl/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-pt-rBR/strings.xml b/app_solcraftlauncher/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-pt-rBR/strings.xml rename to app_solcraftlauncher/src/main/res/values-pt-rBR/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-pt/strings.xml b/app_solcraftlauncher/src/main/res/values-pt/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-pt/strings.xml rename to app_solcraftlauncher/src/main/res/values-pt/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ro/strings.xml b/app_solcraftlauncher/src/main/res/values-ro/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ro/strings.xml rename to app_solcraftlauncher/src/main/res/values-ro/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-rpr/strings.xml b/app_solcraftlauncher/src/main/res/values-rpr/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-rpr/strings.xml rename to app_solcraftlauncher/src/main/res/values-rpr/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ru/strings.xml b/app_solcraftlauncher/src/main/res/values-ru/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-ru/strings.xml rename to app_solcraftlauncher/src/main/res/values-ru/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-sk-rSK/strings.xml b/app_solcraftlauncher/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-sk-rSK/strings.xml rename to app_solcraftlauncher/src/main/res/values-sk-rSK/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-sr-rCS/strings.xml b/app_solcraftlauncher/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-sr-rCS/strings.xml rename to app_solcraftlauncher/src/main/res/values-sr-rCS/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-sr/strings.xml b/app_solcraftlauncher/src/main/res/values-sr/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-sr/strings.xml rename to app_solcraftlauncher/src/main/res/values-sr/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-sv/strings.xml b/app_solcraftlauncher/src/main/res/values-sv/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-sv/strings.xml rename to app_solcraftlauncher/src/main/res/values-sv/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-th/strings.xml b/app_solcraftlauncher/src/main/res/values-th/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-th/strings.xml rename to app_solcraftlauncher/src/main/res/values-th/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-tr/strings.xml b/app_solcraftlauncher/src/main/res/values-tr/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-tr/strings.xml rename to app_solcraftlauncher/src/main/res/values-tr/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-tt/strings.xml b/app_solcraftlauncher/src/main/res/values-tt/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-tt/strings.xml rename to app_solcraftlauncher/src/main/res/values-tt/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-uk/strings.xml b/app_solcraftlauncher/src/main/res/values-uk/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-uk/strings.xml rename to app_solcraftlauncher/src/main/res/values-uk/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-vi/strings.xml b/app_solcraftlauncher/src/main/res/values-vi/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-vi/strings.xml rename to app_solcraftlauncher/src/main/res/values-vi/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-zh-rCN/strings.xml b/app_solcraftlauncher/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-zh-rCN/strings.xml rename to app_solcraftlauncher/src/main/res/values-zh-rCN/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values-zh-rTW/strings.xml b/app_solcraftlauncher/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values-zh-rTW/strings.xml rename to app_solcraftlauncher/src/main/res/values-zh-rTW/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values/colors.xml b/app_solcraftlauncher/src/main/res/values/colors.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values/colors.xml rename to app_solcraftlauncher/src/main/res/values/colors.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values/dimens.xml b/app_solcraftlauncher/src/main/res/values/dimens.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values/dimens.xml rename to app_solcraftlauncher/src/main/res/values/dimens.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values/headings_array.xml b/app_solcraftlauncher/src/main/res/values/headings_array.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values/headings_array.xml rename to app_solcraftlauncher/src/main/res/values/headings_array.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values/ic_launcher_background.xml b/app_solcraftlauncher/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values/ic_launcher_background.xml rename to app_solcraftlauncher/src/main/res/values/ic_launcher_background.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values/strings.xml b/app_solcraftlauncher/src/main/res/values/strings.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values/strings.xml rename to app_solcraftlauncher/src/main/res/values/strings.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/values/styles.xml b/app_solcraftlauncher/src/main/res/values/styles.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/values/styles.xml rename to app_solcraftlauncher/src/main/res/values/styles.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_control.xml b/app_solcraftlauncher/src/main/res/xml/pref_control.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_control.xml rename to app_solcraftlauncher/src/main/res/xml/pref_control.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_experimental.xml b/app_solcraftlauncher/src/main/res/xml/pref_experimental.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_experimental.xml rename to app_solcraftlauncher/src/main/res/xml/pref_experimental.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_java.xml b/app_solcraftlauncher/src/main/res/xml/pref_java.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_java.xml rename to app_solcraftlauncher/src/main/res/xml/pref_java.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_main.xml b/app_solcraftlauncher/src/main/res/xml/pref_main.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_main.xml rename to app_solcraftlauncher/src/main/res/xml/pref_main.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_misc.xml b/app_solcraftlauncher/src/main/res/xml/pref_misc.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_misc.xml rename to app_solcraftlauncher/src/main/res/xml/pref_misc.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_video.xml b/app_solcraftlauncher/src/main/res/xml/pref_video.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/pref_video.xml rename to app_solcraftlauncher/src/main/res/xml/pref_video.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/provider.xml b/app_solcraftlauncher/src/main/res/xml/provider.xml similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/src/main/res/xml/provider.xml rename to app_solcraftlauncher/src/main/res/xml/provider.xml diff --git a/app_solcraftlauncher/app_pojavlauncher/upload.jks b/app_solcraftlauncher/upload.jks similarity index 100% rename from app_solcraftlauncher/app_pojavlauncher/upload.jks rename to app_solcraftlauncher/upload.jks