diff --git a/project.hxp b/project.hxp
index 2bb4e2fba..fc4830540 100644
--- a/project.hxp
+++ b/project.hxp
@@ -978,7 +978,7 @@ class Project extends HXProject
 
   function configureAndroid()
   {
-    javaPaths.push(Path.join([SOURCE_DIR, 'funkin/mobile/external/android/java']));
+    javaPaths.push(Path.join([SOURCE_DIR, 'funkin/external/android/java']));
 
     if (isRelease())
     {
diff --git a/source/funkin/InitState.hx b/source/funkin/InitState.hx
index 0cafefb91..3193f9b8d 100644
--- a/source/funkin/InitState.hx
+++ b/source/funkin/InitState.hx
@@ -114,7 +114,7 @@ class InitState extends FlxState
 
     #if ios
     // Setup Audio session
-    funkin.mobile.external.ios.AudioSession.initialize();
+    funkin.external.ios.AudioSession.initialize();
     #end
 
     // This ain't a pixel art game! (most of the time)
@@ -202,7 +202,7 @@ class InitState extends FlxState
     //
     #if android
     FlxG.android.preventDefaultKeys = [flixel.input.android.FlxAndroidKey.BACK];
-    funkin.mobile.external.android.CallbackUtil.init();
+    funkin.external.android.CallbackUtil.init();
     #end
 
     //
diff --git a/source/funkin/mobile/external/android/CallbackUtil.hx b/source/funkin/external/android/CallbackUtil.hx
similarity index 94%
rename from source/funkin/mobile/external/android/CallbackUtil.hx
rename to source/funkin/external/android/CallbackUtil.hx
index fe04f27d7..4d7be5402 100644
--- a/source/funkin/mobile/external/android/CallbackUtil.hx
+++ b/source/funkin/external/android/CallbackUtil.hx
@@ -1,4 +1,4 @@
-package funkin.mobile.external.android;
+package funkin.external.android;
 
 import lime.system.JNI;
 import flixel.util.FlxSignal;
@@ -51,7 +51,7 @@ class CallbackUtil
 class CallbackHandler #if (lime >= "8.0.0") implements JNISafety #end
 {
   #if android
-  @:allow(funkin.mobile.external.android.CallbackUtil)
+  @:allow(funkin.external.android.CallbackUtil)
   function new():Void {}
 
   /**
diff --git a/source/funkin/mobile/external/android/DataFolderUtil.hx b/source/funkin/external/android/DataFolderUtil.hx
similarity index 92%
rename from source/funkin/mobile/external/android/DataFolderUtil.hx
rename to source/funkin/external/android/DataFolderUtil.hx
index e18c2de64..a91327b1d 100644
--- a/source/funkin/mobile/external/android/DataFolderUtil.hx
+++ b/source/funkin/external/android/DataFolderUtil.hx
@@ -1,4 +1,4 @@
-package funkin.mobile.external.android;
+package funkin.external.android;
 
 /**
  * A Utility class to manage the Application's Data folder on Android.
diff --git a/source/funkin/mobile/external/android/JNIUtil.hx b/source/funkin/external/android/JNIUtil.hx
similarity index 99%
rename from source/funkin/mobile/external/android/JNIUtil.hx
rename to source/funkin/external/android/JNIUtil.hx
index 52d66e55e..cfebdfdad 100644
--- a/source/funkin/mobile/external/android/JNIUtil.hx
+++ b/source/funkin/external/android/JNIUtil.hx
@@ -1,4 +1,4 @@
-package funkin.mobile.external.android;
+package funkin.external.android;
 
 #if android
 import lime.system.JNI;
diff --git a/source/funkin/mobile/external/android/ScreenUtil.hx b/source/funkin/external/android/ScreenUtil.hx
similarity index 97%
rename from source/funkin/mobile/external/android/ScreenUtil.hx
rename to source/funkin/external/android/ScreenUtil.hx
index 54c6e8825..01a063b7a 100644
--- a/source/funkin/mobile/external/android/ScreenUtil.hx
+++ b/source/funkin/external/android/ScreenUtil.hx
@@ -1,4 +1,4 @@
-package funkin.mobile.external.android;
+package funkin.external.android;
 
 import lime.math.Rectangle;
 import lime.system.JNI;
diff --git a/source/funkin/mobile/external/android/java/funkin/extension/CallbackUtil.java b/source/funkin/external/android/java/funkin/extension/CallbackUtil.java
similarity index 100%
rename from source/funkin/mobile/external/android/java/funkin/extension/CallbackUtil.java
rename to source/funkin/external/android/java/funkin/extension/CallbackUtil.java
diff --git a/source/funkin/mobile/external/android/java/funkin/provider/DataFolderProvider.java b/source/funkin/external/android/java/funkin/provider/DataFolderProvider.java
similarity index 100%
rename from source/funkin/mobile/external/android/java/funkin/provider/DataFolderProvider.java
rename to source/funkin/external/android/java/funkin/provider/DataFolderProvider.java
diff --git a/source/funkin/mobile/external/android/java/funkin/util/DataFolderUtil.java b/source/funkin/external/android/java/funkin/util/DataFolderUtil.java
similarity index 100%
rename from source/funkin/mobile/external/android/java/funkin/util/DataFolderUtil.java
rename to source/funkin/external/android/java/funkin/util/DataFolderUtil.java
diff --git a/source/funkin/mobile/external/android/java/funkin/util/ScreenUtil.java b/source/funkin/external/android/java/funkin/util/ScreenUtil.java
similarity index 100%
rename from source/funkin/mobile/external/android/java/funkin/util/ScreenUtil.java
rename to source/funkin/external/android/java/funkin/util/ScreenUtil.java
diff --git a/source/funkin/mobile/external/ios/AudioSession.hx b/source/funkin/external/ios/AudioSession.hx
similarity index 71%
rename from source/funkin/mobile/external/ios/AudioSession.hx
rename to source/funkin/external/ios/AudioSession.hx
index deca7e3ce..44fc859c0 100644
--- a/source/funkin/mobile/external/ios/AudioSession.hx
+++ b/source/funkin/external/ios/AudioSession.hx
@@ -1,9 +1,9 @@
-package funkin.mobile.external.ios;
+package funkin.external.ios;
 
 /**
  * A Utility class to manage iOS audio.
  */
-@:build(funkin.mobile.macros.LinkerMacro.xml('project/Build.xml'))
+@:build(funkin.util.macro.LinkerMacro.xml('project/Build.xml'))
 @:include('AudioSession.hpp')
 @:unreflective
 extern class AudioSession
diff --git a/source/funkin/mobile/external/ios/ScreenUtil.hx b/source/funkin/external/ios/ScreenUtil.hx
similarity index 81%
rename from source/funkin/mobile/external/ios/ScreenUtil.hx
rename to source/funkin/external/ios/ScreenUtil.hx
index 76d93a704..62fded218 100644
--- a/source/funkin/mobile/external/ios/ScreenUtil.hx
+++ b/source/funkin/external/ios/ScreenUtil.hx
@@ -1,9 +1,9 @@
-package funkin.mobile.external.ios;
+package funkin.external.ios;
 
 /**
  * A Utility class to get iOS screen related informations.
  */
-@:build(funkin.mobile.macros.LinkerMacro.xml('project/Build.xml'))
+@:build(funkin.util.macro.LinkerMacro.xml('project/Build.xml'))
 @:include('ScreenUtil.hpp')
 @:unreflective
 extern class ScreenUtil
diff --git a/source/funkin/mobile/external/ios/project/Build.xml b/source/funkin/external/ios/project/Build.xml
similarity index 100%
rename from source/funkin/mobile/external/ios/project/Build.xml
rename to source/funkin/external/ios/project/Build.xml
diff --git a/source/funkin/mobile/external/ios/project/ios/include/AudioSession.hpp b/source/funkin/external/ios/project/ios/include/AudioSession.hpp
similarity index 100%
rename from source/funkin/mobile/external/ios/project/ios/include/AudioSession.hpp
rename to source/funkin/external/ios/project/ios/include/AudioSession.hpp
diff --git a/source/funkin/mobile/external/ios/project/ios/include/ScreenUtil.hpp b/source/funkin/external/ios/project/ios/include/ScreenUtil.hpp
similarity index 100%
rename from source/funkin/mobile/external/ios/project/ios/include/ScreenUtil.hpp
rename to source/funkin/external/ios/project/ios/include/ScreenUtil.hpp
diff --git a/source/funkin/mobile/external/ios/project/ios/src/AudioSession.mm b/source/funkin/external/ios/project/ios/src/AudioSession.mm
similarity index 100%
rename from source/funkin/mobile/external/ios/project/ios/src/AudioSession.mm
rename to source/funkin/external/ios/project/ios/src/AudioSession.mm
diff --git a/source/funkin/mobile/external/ios/project/ios/src/ScreenUtil.mm b/source/funkin/external/ios/project/ios/src/ScreenUtil.mm
similarity index 100%
rename from source/funkin/mobile/external/ios/project/ios/src/ScreenUtil.mm
rename to source/funkin/external/ios/project/ios/src/ScreenUtil.mm
diff --git a/source/funkin/mobile/util/ScreenUtil.hx b/source/funkin/mobile/util/ScreenUtil.hx
index 27bf023f3..cb1a9c562 100644
--- a/source/funkin/mobile/util/ScreenUtil.hx
+++ b/source/funkin/mobile/util/ScreenUtil.hx
@@ -1,9 +1,9 @@
 package funkin.mobile.util;
 
 #if ios
-import funkin.mobile.external.ios.ScreenUtil as NativeScreenUtil;
+import funkin.external.ios.ScreenUtil as NativeScreenUtil;
 #elseif android
-import funkin.mobile.external.android.ScreenUtil as NativeScreenUtil;
+import funkin.external.android.ScreenUtil as NativeScreenUtil;
 #end
 import lime.math.Rectangle;
 import lime.system.System;
diff --git a/source/funkin/ui/options/OptionsState.hx b/source/funkin/ui/options/OptionsState.hx
index 82aa62fe5..ebf538dff 100644
--- a/source/funkin/ui/options/OptionsState.hx
+++ b/source/funkin/ui/options/OptionsState.hx
@@ -198,7 +198,7 @@ class OptionsMenu extends Page<OptionsMenuPageName>
     #end
     #if android
     createItem("OPEN DATA FOLDER", function() {
-      funkin.mobile.external.android.DataFolderUtil.openDataFolder();
+      funkin.external.android.DataFolderUtil.openDataFolder();
     });
     #end
     #if FEATURE_NEWGROUNDS
diff --git a/source/funkin/mobile/macros/LinkerMacro.hx b/source/funkin/util/macro/LinkerMacro.hx
similarity index 78%
rename from source/funkin/mobile/macros/LinkerMacro.hx
rename to source/funkin/util/macro/LinkerMacro.hx
index 009bc193c..4b4ba4d3a 100644
--- a/source/funkin/mobile/macros/LinkerMacro.hx
+++ b/source/funkin/util/macro/LinkerMacro.hx
@@ -1,4 +1,4 @@
-package funkin.mobile.macros;
+package funkin.util.macro;
 
 import haxe.macro.Context;
 import haxe.macro.Expr;
@@ -16,14 +16,14 @@ class LinkerMacro
 {
   /**
    * Adds an XML `<include>` element to the class's metadata, pointing to a specified build file.
-   * @param file_name The name of the XML file to include. Defaults to `Build.xml` if not provided.
+   * @param fileName The name of the XML file to include. Defaults to `Build.xml` if not provided.
    * @return An array of fields that are processed during the build.
    */
-  public static macro function xml(?file_name:String = 'Build.xml'):Array<Field>
+  public static macro function xml(?fileName:String = 'Build.xml'):Array<Field>
   {
     final pos:Position = Context.currentPos();
     final sourcePath:String = FileSystem.absolutePath(Context.getPosInfos(pos).file.directory()).removeTrailingSlashes();
-    final fileToInclude:String = Path.join([sourcePath, file_name?.length > 0 ? file_name : 'Build.xml']);
+    final fileToInclude:String = Path.join([sourcePath, fileName?.length > 0 ? fileName : 'Build.xml']);
 
     if (!FileSystem.exists(fileToInclude)) Context.error('The specified file "$fileToInclude" could not be found at "$sourcePath".', pos);
 
diff --git a/source/funkin/util/plugins/ReloadAssetsDebugPlugin.hx b/source/funkin/util/plugins/ReloadAssetsDebugPlugin.hx
index 51424c1f3..077ac6672 100644
--- a/source/funkin/util/plugins/ReloadAssetsDebugPlugin.hx
+++ b/source/funkin/util/plugins/ReloadAssetsDebugPlugin.hx
@@ -5,7 +5,7 @@ import flixel.FlxBasic;
 import funkin.ui.MusicBeatState;
 import funkin.ui.MusicBeatSubState;
 #if android
-import funkin.mobile.external.android.CallbackUtil;
+import funkin.external.android.CallbackUtil;
 #end
 
 /**