diff --git a/buildnumber.txt b/buildnumber.txt
index 2b82dfea..83233289 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-60
\ No newline at end of file
+67
\ No newline at end of file
diff --git a/source/Main.hx b/source/Main.hx
index e836ad63..4f509255 100644
--- a/source/Main.hx
+++ b/source/Main.hx
@@ -1,5 +1,6 @@
 package;
 
+import funkin.menus.TitleState;
 import flixel.FlxGame;
 import flixel.FlxState;
 import openfl.Assets;
diff --git a/source/funkin/game/GameOverSubstate.hx b/source/funkin/game/GameOverSubstate.hx
index 13b6e153..8ec99815 100644
--- a/source/funkin/game/GameOverSubstate.hx
+++ b/source/funkin/game/GameOverSubstate.hx
@@ -6,6 +6,8 @@ import flixel.FlxSubState;
 import flixel.math.FlxPoint;
 import flixel.util.FlxColor;
 import flixel.util.FlxTimer;
+import funkin.menus.StoryMenuState;
+import funkin.menus.FreeplayState;
 
 class GameOverSubstate extends MusicBeatSubstate
 {
diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx
index a5626b41..425c45ed 100644
--- a/source/funkin/game/PlayState.hx
+++ b/source/funkin/game/PlayState.hx
@@ -42,6 +42,8 @@ import openfl.display.BlendMode;
 import openfl.display.StageQuality;
 import openfl.filters.ShaderFilter;
 
+import funkin.menus.*;
+
 using StringTools;
 
 class PlayState extends MusicBeatState
diff --git a/source/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx
similarity index 99%
rename from source/FreeplayState.hx
rename to source/funkin/menus/FreeplayState.hx
index 383d54f1..adaa612c 100644
--- a/source/FreeplayState.hx
+++ b/source/funkin/menus/FreeplayState.hx
@@ -1,4 +1,4 @@
-package;
+package funkin.menus;
 
 #if desktop
 import Discord.DiscordClient;
diff --git a/source/GitarooPause.hx b/source/funkin/menus/GitarooPause.hx
similarity index 98%
rename from source/GitarooPause.hx
rename to source/funkin/menus/GitarooPause.hx
index cb9705c5..9345c41d 100644
--- a/source/GitarooPause.hx
+++ b/source/funkin/menus/GitarooPause.hx
@@ -1,4 +1,4 @@
-package;
+package funkin.menus;
 
 import flixel.FlxG;
 import flixel.FlxSprite;
diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx
index 408a535e..48aabd08 100644
--- a/source/funkin/menus/MainMenuState.hx
+++ b/source/funkin/menus/MainMenuState.hx
@@ -96,7 +96,7 @@ class MainMenuState extends MusicBeatState
 		FlxG.camera.follow(camFollow, null, 0.06);
 
 		trace(Main.buildNumber);
-		var versionShit:FlxText = new FlxText(5, FlxG.height - 2, 0, 'Codename Engine v${Application.current.meta.get('version')}\r\nPre-Alpha: Build ${Main.buildNumber}', 12);
+		var versionShit:FlxText = new FlxText(5, FlxG.height - 2, 0, 'Codename Engine v${Application.current.meta.get('version')}\nPre-Alpha: Build ${Main.buildNumber}\n', 12);
 		versionShit.scrollFactor.set();
 		versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
 		versionShit.y -= versionShit.height;
diff --git a/source/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx
similarity index 99%
rename from source/PauseSubState.hx
rename to source/funkin/menus/PauseSubState.hx
index 2e36eda0..e213f12a 100644
--- a/source/PauseSubState.hx
+++ b/source/funkin/menus/PauseSubState.hx
@@ -1,4 +1,4 @@
-package;
+package funkin.menus;
 
 import Controls.Control;
 import flixel.FlxG;
diff --git a/source/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx
similarity index 99%
rename from source/StoryMenuState.hx
rename to source/funkin/menus/StoryMenuState.hx
index 1c2dc878..5e5b99d6 100644
--- a/source/StoryMenuState.hx
+++ b/source/funkin/menus/StoryMenuState.hx
@@ -1,4 +1,4 @@
-package;
+package funkin.menus;
 
 #if desktop
 import Discord.DiscordClient;
diff --git a/source/TitleState.hx b/source/funkin/menus/TitleState.hx
similarity index 99%
rename from source/TitleState.hx
rename to source/funkin/menus/TitleState.hx
index 841404fb..731c765a 100644
--- a/source/TitleState.hx
+++ b/source/funkin/menus/TitleState.hx
@@ -1,4 +1,4 @@
-package;
+package funkin.menus;
 
 #if desktop
 import Discord.DiscordClient;