diff --git a/sonic-radiance.love/scenes/init.lua b/sonic-radiance.love/scenes/init.lua
index d2e42d8..94aa23c 100644
--- a/sonic-radiance.love/scenes/init.lua
+++ b/sonic-radiance.love/scenes/init.lua
@@ -1,9 +1,9 @@
 return {
-  test = require "scenes.test_scene",
-  test2 = require "scenes.test_scene2",
-  title = require "scenes.titlescreen",
+  test = require "scenes.subgames.testBattle",
+  test2 = require "scenes.subgames.testShoot",
+  title = require "scenes.menus.titlescreen",
   cbs   = require "scenes.battlesystem",
   debug = require "scenes.debug",
-  options = require "scenes.options",
+  options = require "scenes.menus.options",
   overworld = require "scenes.overworld"
 }
diff --git a/sonic-radiance.love/scenes/options/assets.lua b/sonic-radiance.love/scenes/menus/options/assets.lua
similarity index 100%
rename from sonic-radiance.love/scenes/options/assets.lua
rename to sonic-radiance.love/scenes/menus/options/assets.lua
diff --git a/sonic-radiance.love/scenes/options/init.lua b/sonic-radiance.love/scenes/menus/options/init.lua
similarity index 93%
rename from sonic-radiance.love/scenes/options/init.lua
rename to sonic-radiance.love/scenes/menus/options/init.lua
index a22b34e..3178774 100644
--- a/sonic-radiance.love/scenes/options/init.lua
+++ b/sonic-radiance.love/scenes/menus/options/init.lua
@@ -1,15 +1,15 @@
 local Scene     = require "core.modules.scenes"
 local OptionsMenu  = Scene:extend()
 
-local OptionMenu = require "scenes.options.menu"
-local Widgets   = require "scenes.options.widgets"
+local OptionMenu = require "scenes.menus.options.menu"
+local Widgets   = require "scenes.menus.options.widgets"
 
 local gui         = require "game.modules.gui"
 
 function OptionsMenu:new()
   OptionsMenu.super.new(self)
 
-  self.assets:batchImport("scenes.options.assets")
+  self.assets:batchImport("scenes.menus.options.assets")
   self:addMenu("main", true)
   self:addSubMenu("video", "video")
   self:addSubMenu("audio", "audio")
diff --git a/sonic-radiance.love/scenes/options/menu.lua b/sonic-radiance.love/scenes/menus/options/menu.lua
similarity index 100%
rename from sonic-radiance.love/scenes/options/menu.lua
rename to sonic-radiance.love/scenes/menus/options/menu.lua
diff --git a/sonic-radiance.love/scenes/options/widgets.lua b/sonic-radiance.love/scenes/menus/options/widgets.lua
similarity index 100%
rename from sonic-radiance.love/scenes/options/widgets.lua
rename to sonic-radiance.love/scenes/menus/options/widgets.lua
diff --git a/sonic-radiance.love/scenes/titlescreen/init.lua b/sonic-radiance.love/scenes/menus/titlescreen/init.lua
similarity index 100%
rename from sonic-radiance.love/scenes/titlescreen/init.lua
rename to sonic-radiance.love/scenes/menus/titlescreen/init.lua
diff --git a/sonic-radiance.love/scenes/test_scene/assets.lua b/sonic-radiance.love/scenes/subgames/testBattle/assets.lua
similarity index 100%
rename from sonic-radiance.love/scenes/test_scene/assets.lua
rename to sonic-radiance.love/scenes/subgames/testBattle/assets.lua
diff --git a/sonic-radiance.love/scenes/test_scene/init.lua b/sonic-radiance.love/scenes/subgames/testBattle/init.lua
similarity index 96%
rename from sonic-radiance.love/scenes/test_scene/init.lua
rename to sonic-radiance.love/scenes/subgames/testBattle/init.lua
index bc276e5..bf0f866 100644
--- a/sonic-radiance.love/scenes/test_scene/init.lua
+++ b/sonic-radiance.love/scenes/subgames/testBattle/init.lua
@@ -30,7 +30,7 @@ function MovePlayer:new(map)
 
   MovePlayer.super.new(self)
   self.assets:batchImport("game.modules.gui.assets")
-  self.assets:batchImport("scenes.test_scene.assets")
+  self.assets:batchImport("scenes.subgames.testBattle.assets")
 
   World(self, "battle", map)
 
diff --git a/sonic-radiance.love/scenes/test_scene2/assets.lua b/sonic-radiance.love/scenes/subgames/testShoot/assets.lua
similarity index 100%
rename from sonic-radiance.love/scenes/test_scene2/assets.lua
rename to sonic-radiance.love/scenes/subgames/testShoot/assets.lua
diff --git a/sonic-radiance.love/scenes/test_scene2/init.lua b/sonic-radiance.love/scenes/subgames/testShoot/init.lua
similarity index 96%
rename from sonic-radiance.love/scenes/test_scene2/init.lua
rename to sonic-radiance.love/scenes/subgames/testShoot/init.lua
index 6898b3f..3a555b6 100644
--- a/sonic-radiance.love/scenes/test_scene2/init.lua
+++ b/sonic-radiance.love/scenes/subgames/testShoot/init.lua
@@ -32,7 +32,7 @@ function MovePlayer:new(playerNumber, cameraMode)
 
   MovePlayer.super.new(self)
   self.assets:batchImport("game.modules.gui.assets")
-  self.assets:batchImport("scenes.test_scene.assets")
+  self.assets:batchImport("scenes.subgames.testShoot.assets")
 
   World(self, "shoot", "forest")