diff --git a/scripts/titlescreen.lua b/scripts/titlescreen.lua
index 99aa667..e042e39 100644
--- a/scripts/titlescreen.lua
+++ b/scripts/titlescreen.lua
@@ -7,23 +7,23 @@ local PageView = require "api.page.pageview"
 local PageManager = require "api.page.pagemanager"
 
 local BootPage = require "titlescreen.boot"
-local CheckUpdatePage = require "titlescreen.pages.boot.checkupdatepage"
+local CheckUpdatePage = require "titlescreen.boot.checkupdatepage"
 
 local SplashPage = require "titlescreen.splash"
-local KShootManiaPage = require "titlescreen.pages.splash.kshootmaniapage"
-local USCPage = require "titlescreen.pages.splash.uscpage"
-local TeamExceedPage = require "titlescreen.pages.splash.teamexceedpage"
-local CreditsPage = require "titlescreen.pages.splash.creditspage"
+local KShootManiaPage = require "titlescreen.splash.kshootmaniapage"
+local USCPage = require "titlescreen.splash.uscpage"
+local TeamExceedPage = require "titlescreen.splash.teamexceedpage"
+local CreditsPage = require "titlescreen.splash.creditspage"
 
 local TitlePage = require "titlescreen.title"
 
 local MainMenuPage = require "titlescreen.mainmenu"
 
 local ServiceMenuPage = require "titlescreen.service"
-local InputCheckPage = require "titlescreen.pages.service.inputcheckpage"
-local ScreenCheckPage = require "titlescreen.pages.service.screencheckpage"
-local ColorCheckPage = require "titlescreen.pages.service.colorcheckpage"
-local VersionInfoPage = require "titlescreen.pages.service.versioninfopage"
+local InputCheckPage = require "titlescreen.service.inputcheckpage"
+local ScreenCheckPage = require "titlescreen.service.screencheckpage"
+local ColorCheckPage = require "titlescreen.service.colorcheckpage"
+local VersionInfoPage = require "titlescreen.service.versioninfopage"
 
 local pageView = PageView.new()
 
diff --git a/scripts/titlescreen/boot.lua b/scripts/titlescreen/boot.lua
index 5d08da2..697595b 100644
--- a/scripts/titlescreen/boot.lua
+++ b/scripts/titlescreen/boot.lua
@@ -7,10 +7,10 @@ local Version = require "common.version"
 local PageManager = require "api.page.pagemanager"
 
 local Page = require "api.page.page"
-local CheckUpdatePage = require "titlescreen.pages.boot.checkupdatepage"
+local CheckUpdatePage = require "titlescreen.boot.checkupdatepage"
 
 local ServiceField = require "api.page.servicefield"
-local ListField = require "titlescreen.commmon.listfield"
+local ListField = require "titlescreen.common.listfield"
 local SelfTestField = require "titlescreen.boot.selftestfield"
 
 ---@class BootPage: Page
diff --git a/scripts/titlescreen/mainmenu.lua b/scripts/titlescreen/mainmenu.lua
index 9848397..0e68d9b 100644
--- a/scripts/titlescreen/mainmenu.lua
+++ b/scripts/titlescreen/mainmenu.lua
@@ -352,7 +352,7 @@ local function tickTransitions(deltaTime)
 end
 
 local PageView = require "api.page.pageview"
-local ModeSelectPage = require "titlescreen.pages.modeselect.modeselectpage"
+local ModeSelectPage = require "titlescreen.modeselect.modeselectpage"
 local PageViewInstance = PageView.new(ModeSelectPage.new())
 
 local function render(deltaTime)