diff --git a/src/glue/CCharacterSelection.cpp b/src/glue/CCharacterSelection.cpp
index bc2e47c..8c58122 100644
--- a/src/glue/CCharacterSelection.cpp
+++ b/src/glue/CCharacterSelection.cpp
@@ -8,7 +8,7 @@
 #include "glue/Types.hpp"
 #include "model/CM2Shared.hpp"
 #include "net/Connection.hpp"
-#include "ui/CSimpleModelFFX.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
 
 int32_t CCharacterSelection::s_characterCount;
 TSGrowableArray<CharacterSelectionDisplay> CCharacterSelection::s_characterList;
diff --git a/src/glue/CGlueMgr.cpp b/src/glue/CGlueMgr.cpp
index 68307d8..220540a 100644
--- a/src/glue/CGlueMgr.cpp
+++ b/src/glue/CGlueMgr.cpp
@@ -17,13 +17,13 @@
 #include "net/Connection.hpp"
 #include "net/Login.hpp"
 #include "sound/SI2.hpp"
-#include "ui/CSimpleModelFFX.hpp"
-#include "ui/CSimpleTop.hpp"
 #include "ui/FrameScript.hpp"
 #include "ui/FrameXML.hpp"
 #include "ui/Interface.hpp"
 #include "ui/ScriptFunctions.hpp"
 #include "ui/game/CGVideoOptions.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Filesystem.hpp"
 #include "util/Locale.hpp"
 #include "util/Log.hpp"
diff --git a/src/glue/CharacterSelectionDisplay.cpp b/src/glue/CharacterSelectionDisplay.cpp
index 3b01f8a..9f48a0e 100644
--- a/src/glue/CharacterSelectionDisplay.cpp
+++ b/src/glue/CharacterSelectionDisplay.cpp
@@ -1,9 +1,9 @@
 #include "glue/CharacterSelectionDisplay.hpp"
+#include "component/CCharacterComponent.hpp"
 #include "db/Db.hpp"
 #include "glue/CCharacterSelection.hpp"
-#include "component/CCharacterComponent.hpp"
 #include "object/client/Player_C.hpp"
-#include "ui/CSimpleModelFFX.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
 
 void CharacterSelectionDisplay::CreateModelData() {
     auto modelData = Player_C_GetModelName(this->m_info.raceID, this->m_info.sexID);
diff --git a/src/ui/CBackdropGenerator.cpp b/src/ui/CBackdropGenerator.cpp
index 9a93e49..1b3fc9e 100644
--- a/src/ui/CBackdropGenerator.cpp
+++ b/src/ui/CBackdropGenerator.cpp
@@ -1,6 +1,6 @@
 #include "ui/CBackdropGenerator.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "ui/LoadXML.hpp"
 #include "ui/Util.hpp"
 #include "util/CStatus.hpp"
diff --git a/src/ui/CFrameStrata.cpp b/src/ui/CFrameStrata.cpp
index c9d1fbc..1fbc42d 100644
--- a/src/ui/CFrameStrata.cpp
+++ b/src/ui/CFrameStrata.cpp
@@ -1,6 +1,6 @@
 #include "ui/CFrameStrata.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleRender.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleRender.hpp"
 
 int32_t CFrameStrataNode::BuildBatches() {
     if (!this->batchDirty) {
diff --git a/src/ui/CFrameStrata.hpp b/src/ui/CFrameStrata.hpp
index 649b22a..19594b9 100644
--- a/src/ui/CFrameStrata.hpp
+++ b/src/ui/CFrameStrata.hpp
@@ -2,7 +2,7 @@
 #define UI_C_FRAME_STRATA_HPP
 
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include <cstdint>
 #include <storm/Array.hpp>
 #include <storm/List.hpp>
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 86aed24..d4e58dc 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -1,6 +1,7 @@
 file(GLOB PRIVATE_SOURCES
     "*.cpp"
     "game/*.cpp"
+    "simple/*.cpp"
 )
 
 add_library(ui STATIC
diff --git a/src/ui/CRenderBatch.cpp b/src/ui/CRenderBatch.cpp
index d80290a..ea55f67 100644
--- a/src/ui/CRenderBatch.cpp
+++ b/src/ui/CRenderBatch.cpp
@@ -1,10 +1,10 @@
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleTexture.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Font.hpp"
 #include "gx/Shader.hpp"
 #include "gx/font/CGxStringBatch.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include <cstdlib>
 #include <storm/Error.hpp>
 
diff --git a/src/ui/CScriptRegion.cpp b/src/ui/CScriptRegion.cpp
index 3d4bd5b..36db208 100644
--- a/src/ui/CScriptRegion.cpp
+++ b/src/ui/CScriptRegion.cpp
@@ -1,7 +1,7 @@
 #include "ui/CScriptRegion.hpp"
 #include "ui/CScriptObject.hpp"
 #include "ui/CScriptRegionScript.hpp"
-#include "ui/CSimpleTop.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Lua.hpp"
 #include <common/XML.hpp>
 
diff --git a/src/ui/CScriptRegionScript.cpp b/src/ui/CScriptRegionScript.cpp
index 8b29774..4c9b489 100644
--- a/src/ui/CScriptRegionScript.cpp
+++ b/src/ui/CScriptRegionScript.cpp
@@ -1,10 +1,10 @@
 #include "ui/CScriptRegionScript.hpp"
 #include "gx/Coordinate.hpp"
-#include "ui/CSimpleFontString.hpp"
 #include "ui/CScriptRegion.hpp"
-#include "ui/CSimpleTexture.hpp"
-#include "ui/CSimpleTop.hpp"
 #include "ui/FrameScript_Object.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
 #include "util/Unimplemented.hpp"
diff --git a/src/ui/FrameXML.cpp b/src/ui/FrameXML.cpp
index 81baa7d..2f99571 100644
--- a/src/ui/FrameXML.cpp
+++ b/src/ui/FrameXML.cpp
@@ -1,18 +1,18 @@
 #include "ui/FrameXML.hpp"
-#include "ui/CSimpleButton.hpp"
-#include "ui/CSimpleCheckbox.hpp"
-#include "ui/CSimpleEditBox.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleHTML.hpp"
-#include "ui/CSimpleModel.hpp"
-#include "ui/CSimpleScrollFrame.hpp"
-#include "ui/CSimpleSlider.hpp"
+#include "ui/simple/CSimpleButton.hpp"
+#include "ui/simple/CSimpleCheckbox.hpp"
+#include "ui/simple/CSimpleEditBox.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleHTML.hpp"
+#include "ui/simple/CSimpleModel.hpp"
+#include "ui/simple/CSimpleScrollFrame.hpp"
+#include "ui/simple/CSimpleSlider.hpp"
 #include "util/CStatus.hpp"
 #include "util/SFile.hpp"
+#include <common/XML.hpp>
 #include <cstdlib>
 #include <cstring>
-#include <common/XML.hpp>
 #include <storm/String.hpp>
 
 int32_t FrameXML::s_debugLevel;
diff --git a/src/ui/LoadXML.cpp b/src/ui/LoadXML.cpp
index b9d7c70..4131b7a 100644
--- a/src/ui/LoadXML.cpp
+++ b/src/ui/LoadXML.cpp
@@ -1,7 +1,7 @@
 #include "ui/LoadXML.hpp"
 #include "gx/Coordinate.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "util/CStatus.hpp"
 #include <common/XML.hpp>
 #include <storm/String.hpp>
diff --git a/src/ui/ScriptFunctions.cpp b/src/ui/ScriptFunctions.cpp
index 3a16262..6ccc29b 100644
--- a/src/ui/ScriptFunctions.cpp
+++ b/src/ui/ScriptFunctions.cpp
@@ -1,17 +1,17 @@
 #include "ui/ScriptFunctions.hpp"
-#include "ui/CSimpleButton.hpp"
-#include "ui/CSimpleCheckbox.hpp"
-#include "ui/CSimpleEditBox.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleHTML.hpp"
-#include "ui/CSimpleModel.hpp"
-#include "ui/CSimpleModelFFX.hpp"
-#include "ui/CSimpleScrollFrame.hpp"
-#include "ui/CSimpleSlider.hpp"
-#include "ui/CSimpleTexture.hpp"
 #include "ui/FrameScript.hpp"
+#include "ui/simple/CSimpleButton.hpp"
+#include "ui/simple/CSimpleCheckbox.hpp"
+#include "ui/simple/CSimpleEditBox.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleHTML.hpp"
+#include "ui/simple/CSimpleModel.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
+#include "ui/simple/CSimpleScrollFrame.hpp"
+#include "ui/simple/CSimpleSlider.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 
 void CharacterCreateRegisterScriptFunctions() {
     for (int32_t i = 0; i < NUM_SCRIPT_FUNCTIONS_CHAR_CREATE; ++i) {
diff --git a/src/ui/ScriptFunctionsCharSelect.cpp b/src/ui/ScriptFunctionsCharSelect.cpp
index d1c383c..059178e 100644
--- a/src/ui/ScriptFunctionsCharSelect.cpp
+++ b/src/ui/ScriptFunctionsCharSelect.cpp
@@ -1,9 +1,9 @@
-#include "ui/ScriptFunctions.hpp"
 #include "db/Db.hpp"
 #include "glue/CCharacterSelection.hpp"
 #include "object/client/Unit_C.hpp"
-#include "ui/CSimpleModelFFX.hpp"
+#include "ui/ScriptFunctions.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>
diff --git a/src/ui/ScriptFunctionsGlueScriptEvents.cpp b/src/ui/ScriptFunctionsGlueScriptEvents.cpp
index 441f51b..537e3d8 100644
--- a/src/ui/ScriptFunctionsGlueScriptEvents.cpp
+++ b/src/ui/ScriptFunctionsGlueScriptEvents.cpp
@@ -1,4 +1,3 @@
-#include "ui/ScriptFunctions.hpp"
 #include "client/Client.hpp"
 #include "client/ClientServices.hpp"
 #include "console/CVar.hpp"
@@ -7,8 +6,9 @@
 #include "gx/Coordinate.hpp"
 #include "net/connection/ClientConnection.hpp"
 #include "sound/Interface.hpp"
-#include "ui/CSimpleTop.hpp"
+#include "ui/ScriptFunctions.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Lua.hpp"
 #include "util/SFile.hpp"
 #include "util/Unimplemented.hpp"
diff --git a/src/ui/ScriptFunctionsSimpleFrame.cpp b/src/ui/ScriptFunctionsSimpleFrame.cpp
index ad060d3..8edeaa4 100644
--- a/src/ui/ScriptFunctionsSimpleFrame.cpp
+++ b/src/ui/ScriptFunctionsSimpleFrame.cpp
@@ -1,12 +1,12 @@
-#include "ui/ScriptFunctions.hpp"
-#include "ui/CSimpleFrame.hpp"
 #include "ui/FrameXML.hpp"
+#include "ui/ScriptFunctions.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "util/CStatus.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
-#include "util/CStatus.hpp"
-#include <cstdint>
 #include <common/XML.hpp>
+#include <cstdint>
 #include <storm/String.hpp>
 
 int32_t Script_GetText(lua_State* L) {
diff --git a/src/ui/CSimpleButton.cpp b/src/ui/simple/CSimpleButton.cpp
similarity index 98%
rename from src/ui/CSimpleButton.cpp
rename to src/ui/simple/CSimpleButton.cpp
index 17b238d..b352222 100644
--- a/src/ui/CSimpleButton.cpp
+++ b/src/ui/simple/CSimpleButton.cpp
@@ -1,11 +1,11 @@
-#include "ui/CSimpleButton.hpp"
+#include "ui/simple/CSimpleButton.hpp"
 #include "event/Input.hpp"
-#include "ui/CSimpleButtonScript.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleTexture.hpp"
-#include "ui/CSimpleTop.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleButtonScript.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/CStatus.hpp"
 #include "util/Lua.hpp"
 #include <common/Time.hpp>
diff --git a/src/ui/CSimpleButton.hpp b/src/ui/simple/CSimpleButton.hpp
similarity index 96%
rename from src/ui/CSimpleButton.hpp
rename to src/ui/simple/CSimpleButton.hpp
index a1a729d..9874b12 100644
--- a/src/ui/CSimpleButton.hpp
+++ b/src/ui/simple/CSimpleButton.hpp
@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_BUTTON_HPP
-#define UI_C_SIMPLE_BUTTON_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_BUTTON_HPP
+#define UI_SIMPLE_C_SIMPLE_BUTTON_HPP
 
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include <tempest/Vector.hpp>
 
 class CSimpleFont;
diff --git a/src/ui/CSimpleButtonScript.cpp b/src/ui/simple/CSimpleButtonScript.cpp
similarity index 98%
rename from src/ui/CSimpleButtonScript.cpp
rename to src/ui/simple/CSimpleButtonScript.cpp
index f26f636..4f1fb70 100644
--- a/src/ui/CSimpleButtonScript.cpp
+++ b/src/ui/simple/CSimpleButtonScript.cpp
@@ -1,9 +1,9 @@
-#include "ui/CSimpleButtonScript.hpp"
+#include "ui/simple/CSimpleButtonScript.hpp"
 #include "gx/Coordinate.hpp"
-#include "ui/CSimpleButton.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleButton.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
 #include "util/Unimplemented.hpp"
diff --git a/src/ui/CSimpleButtonScript.hpp b/src/ui/simple/CSimpleButtonScript.hpp
similarity index 64%
rename from src/ui/CSimpleButtonScript.hpp
rename to src/ui/simple/CSimpleButtonScript.hpp
index 72ce17d..30f7a0a 100644
--- a/src/ui/CSimpleButtonScript.hpp
+++ b/src/ui/simple/CSimpleButtonScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_BUTTON_SCRIPT_HPP
-#define UI_C_SIMPLE_BUTTON_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_BUTTON_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_BUTTON_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleCheckbox.cpp b/src/ui/simple/CSimpleCheckbox.cpp
similarity index 96%
rename from src/ui/CSimpleCheckbox.cpp
rename to src/ui/simple/CSimpleCheckbox.cpp
index 55b2ab3..72b4c0a 100644
--- a/src/ui/CSimpleCheckbox.cpp
+++ b/src/ui/simple/CSimpleCheckbox.cpp
@@ -1,7 +1,7 @@
-#include "ui/CSimpleCheckbox.hpp"
-#include "ui/CSimpleCheckboxScript.hpp"
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleCheckbox.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleCheckboxScript.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "util/StringTo.hpp"
 #include <common/XML.hpp>
 
diff --git a/src/ui/CSimpleCheckbox.hpp b/src/ui/simple/CSimpleCheckbox.hpp
similarity index 90%
rename from src/ui/CSimpleCheckbox.hpp
rename to src/ui/simple/CSimpleCheckbox.hpp
index c6a6cb6..0ed013c 100644
--- a/src/ui/CSimpleCheckbox.hpp
+++ b/src/ui/simple/CSimpleCheckbox.hpp
@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_CHECKBOX_HPP
-#define UI_C_SIMPLE_CHECKBOX_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_CHECKBOX_HPP
+#define UI_SIMPLE_C_SIMPLE_CHECKBOX_HPP
 
-#include "ui/CSimpleButton.hpp"
+#include "ui/simple/CSimpleButton.hpp"
 
 class CSimpleCheckbox : public CSimpleButton {
     public:
diff --git a/src/ui/CSimpleCheckboxScript.cpp b/src/ui/simple/CSimpleCheckboxScript.cpp
similarity index 94%
rename from src/ui/CSimpleCheckboxScript.cpp
rename to src/ui/simple/CSimpleCheckboxScript.cpp
index 869489b..278c330 100644
--- a/src/ui/CSimpleCheckboxScript.cpp
+++ b/src/ui/simple/CSimpleCheckboxScript.cpp
@@ -1,5 +1,5 @@
-#include "ui/CSimpleCheckboxScript.hpp"
-#include "ui/CSimpleCheckbox.hpp"
+#include "ui/simple/CSimpleCheckboxScript.hpp"
+#include "ui/simple/CSimpleCheckbox.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
 #include "util/Unimplemented.hpp"
diff --git a/src/ui/CSimpleCheckboxScript.hpp b/src/ui/simple/CSimpleCheckboxScript.hpp
similarity index 64%
rename from src/ui/CSimpleCheckboxScript.hpp
rename to src/ui/simple/CSimpleCheckboxScript.hpp
index 4ef108c..44693c9 100644
--- a/src/ui/CSimpleCheckboxScript.hpp
+++ b/src/ui/simple/CSimpleCheckboxScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_CHECKBOX_SCRIPT_HPP
-#define UI_C_SIMPLE_CHECKBOX_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_CHECKBOX_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_CHECKBOX_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleEditBox.cpp b/src/ui/simple/CSimpleEditBox.cpp
similarity index 99%
rename from src/ui/CSimpleEditBox.cpp
rename to src/ui/simple/CSimpleEditBox.cpp
index 6440e2c..430ffdd 100644
--- a/src/ui/CSimpleEditBox.cpp
+++ b/src/ui/simple/CSimpleEditBox.cpp
@@ -1,20 +1,20 @@
-#include "ui/CSimpleEditBox.hpp"
-#include "gx/Gx.hpp"
+#include "ui/simple/CSimpleEditBox.hpp"
 #include "gx/Coordinate.hpp"
-#include "ui/CSimpleEditBoxScript.hpp"
-#include "ui/CSimpleFontedFrameFont.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleTexture.hpp"
-#include "ui/CSimpleTop.hpp"
+#include "gx/Gx.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleEditBoxScript.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFontedFrameFont.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Byte.hpp"
 #include "util/CStatus.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
-#include <cstring>
 #include <common/XML.hpp>
 #include <storm/String.hpp>
 #include <storm/Unicode.hpp>
+#include <cstring>
 
 CSimpleEditBox* CSimpleEditBox::s_currentFocus;
 int32_t CSimpleEditBox::s_metatable;
diff --git a/src/ui/CSimpleEditBox.hpp b/src/ui/simple/CSimpleEditBox.hpp
similarity index 96%
rename from src/ui/CSimpleEditBox.hpp
rename to src/ui/simple/CSimpleEditBox.hpp
index 0b276b7..78467b2 100644
--- a/src/ui/CSimpleEditBox.hpp
+++ b/src/ui/simple/CSimpleEditBox.hpp
@@ -1,8 +1,8 @@
-#ifndef UI_C_SIMPLE_EDIT_BOX_HPP
-#define UI_C_SIMPLE_EDIT_BOX_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_EDIT_BOX_HPP
+#define UI_SIMPLE_C_SIMPLE_EDIT_BOX_HPP
 
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleFontedFrame.hpp"
+#include "ui/simple/CSimpleFontedFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 
 class CObserver;
 class CSimpleFontString;
diff --git a/src/ui/CSimpleEditBoxScript.cpp b/src/ui/simple/CSimpleEditBoxScript.cpp
similarity index 99%
rename from src/ui/CSimpleEditBoxScript.cpp
rename to src/ui/simple/CSimpleEditBoxScript.cpp
index 85b443a..49380df 100644
--- a/src/ui/CSimpleEditBoxScript.cpp
+++ b/src/ui/simple/CSimpleEditBoxScript.cpp
@@ -1,5 +1,5 @@
-#include "ui/CSimpleEditBoxScript.hpp"
-#include "ui/CSimpleEditBox.hpp"
+#include "ui/simple/CSimpleEditBoxScript.hpp"
+#include "ui/simple/CSimpleEditBox.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>
diff --git a/src/ui/CSimpleEditBoxScript.hpp b/src/ui/simple/CSimpleEditBoxScript.hpp
similarity index 64%
rename from src/ui/CSimpleEditBoxScript.hpp
rename to src/ui/simple/CSimpleEditBoxScript.hpp
index 34ee28d..a717ef3 100644
--- a/src/ui/CSimpleEditBoxScript.hpp
+++ b/src/ui/simple/CSimpleEditBoxScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_EDIT_BOX_SCRIPT_HPP
-#define UI_C_SIMPLE_EDIT_BOX_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_EDIT_BOX_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_EDIT_BOX_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleFont.cpp b/src/ui/simple/CSimpleFont.cpp
similarity index 98%
rename from src/ui/CSimpleFont.cpp
rename to src/ui/simple/CSimpleFont.cpp
index 4aca031..952bd22 100644
--- a/src/ui/CSimpleFont.cpp
+++ b/src/ui/simple/CSimpleFont.cpp
@@ -1,10 +1,10 @@
-#include "ui/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFont.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Font.hpp"
-#include "ui/CSimpleFontScript.hpp"
 #include "ui/FrameXML.hpp"
 #include "ui/LoadXML.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleFontScript.hpp"
 #include "util/CStatus.hpp"
 #include "util/StringTo.hpp"
 #include <common/XML.hpp>
diff --git a/src/ui/CSimpleFont.hpp b/src/ui/simple/CSimpleFont.hpp
similarity index 89%
rename from src/ui/CSimpleFont.hpp
rename to src/ui/simple/CSimpleFont.hpp
index d51a90c..d397e4e 100644
--- a/src/ui/CSimpleFont.hpp
+++ b/src/ui/simple/CSimpleFont.hpp
@@ -1,12 +1,12 @@
-#ifndef UI_C_SIMPLE_FONT_HPP
-#define UI_C_SIMPLE_FONT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONT_HPP
+#define UI_SIMPLE_C_SIMPLE_FONT_HPP
 
-#include "ui/CSimpleFontable.hpp"
-#include "ui/CSimpleFontStringAttributes.hpp"
 #include "ui/FrameScript_Object.hpp"
-#include <cstdint>
+#include "ui/simple/CSimpleFontStringAttributes.hpp"
+#include "ui/simple/CSimpleFontable.hpp"
 #include <storm/Hash.hpp>
 #include <storm/List.hpp>
+#include <cstdint>
 
 class CSimpleFont;
 class CStatus;
diff --git a/src/ui/CSimpleFontScript.cpp b/src/ui/simple/CSimpleFontScript.cpp
similarity index 98%
rename from src/ui/CSimpleFontScript.cpp
rename to src/ui/simple/CSimpleFontScript.cpp
index f1038dc..4dc3bab 100644
--- a/src/ui/CSimpleFontScript.cpp
+++ b/src/ui/simple/CSimpleFontScript.cpp
@@ -1,5 +1,5 @@
-#include "ui/CSimpleFontScript.hpp"
-#include "ui/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontScript.hpp"
+#include "ui/simple/CSimpleFont.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>
diff --git a/src/ui/CSimpleFontScript.hpp b/src/ui/simple/CSimpleFontScript.hpp
similarity index 65%
rename from src/ui/CSimpleFontScript.hpp
rename to src/ui/simple/CSimpleFontScript.hpp
index 31fd693..2b677ad 100644
--- a/src/ui/CSimpleFontScript.hpp
+++ b/src/ui/simple/CSimpleFontScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_FONT_SCRIPT_HPP
-#define UI_C_SIMPLE_FONT_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONT_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_FONT_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleFontString.cpp b/src/ui/simple/CSimpleFontString.cpp
similarity index 99%
rename from src/ui/CSimpleFontString.cpp
rename to src/ui/simple/CSimpleFontString.cpp
index b5319d8..b65879e 100644
--- a/src/ui/CSimpleFontString.cpp
+++ b/src/ui/simple/CSimpleFontString.cpp
@@ -1,16 +1,16 @@
-#include "ui/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
 #include "gx/Coordinate.hpp"
 #include "math/Utils.hpp"
 #include "ui/CFramePoint.hpp"
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFontStringScript.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleTop.hpp"
 #include "ui/FrameXML.hpp"
 #include "ui/LoadXML.hpp"
 #include "ui/Types.hpp"
 #include "ui/Util.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontStringScript.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/CStatus.hpp"
 #include "util/StringTo.hpp"
 #include <common/XML.hpp>
diff --git a/src/ui/CSimpleFontString.hpp b/src/ui/simple/CSimpleFontString.hpp
similarity index 95%
rename from src/ui/CSimpleFontString.hpp
rename to src/ui/simple/CSimpleFontString.hpp
index 988820f..67cbefd 100644
--- a/src/ui/CSimpleFontString.hpp
+++ b/src/ui/simple/CSimpleFontString.hpp
@@ -1,9 +1,9 @@
-#ifndef UI_C_SIMPLE_FONT_STRING_HPP
-#define UI_C_SIMPLE_FONT_STRING_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONT_STRING_HPP
+#define UI_SIMPLE_C_SIMPLE_FONT_STRING_HPP
 
 #include "gx/Font.hpp"
-#include "ui/CSimpleFontable.hpp"
-#include "ui/CSimpleRegion.hpp"
+#include "ui/simple/CSimpleFontable.hpp"
+#include "ui/simple/CSimpleRegion.hpp"
 
 class CRenderBatch;
 class CSimpleFrame;
diff --git a/src/ui/CSimpleFontStringAttributes.cpp b/src/ui/simple/CSimpleFontStringAttributes.cpp
similarity index 98%
rename from src/ui/CSimpleFontStringAttributes.cpp
rename to src/ui/simple/CSimpleFontStringAttributes.cpp
index 042179b..1c790bb 100644
--- a/src/ui/CSimpleFontStringAttributes.cpp
+++ b/src/ui/simple/CSimpleFontStringAttributes.cpp
@@ -1,7 +1,7 @@
-#include "ui/CSimpleFontStringAttributes.hpp"
+#include "ui/simple/CSimpleFontStringAttributes.hpp"
 #include "gx/Font.hpp"
 #include "math/Utils.hpp"
-#include "ui/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
 #include <storm/Error.hpp>
 
 void CSimpleFontStringAttributes::SetColor(const CImVector& color) {
diff --git a/src/ui/CSimpleFontStringAttributes.hpp b/src/ui/simple/CSimpleFontStringAttributes.hpp
similarity index 91%
rename from src/ui/CSimpleFontStringAttributes.hpp
rename to src/ui/simple/CSimpleFontStringAttributes.hpp
index 7d1c7b1..da1f88f 100644
--- a/src/ui/CSimpleFontStringAttributes.hpp
+++ b/src/ui/simple/CSimpleFontStringAttributes.hpp
@@ -1,9 +1,9 @@
-#ifndef UI_C_SIMPLE_FONT_STRING_ATTRIBUTES_HPP
-#define UI_C_SIMPLE_FONT_STRING_ATTRIBUTES_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONT_STRING_ATTRIBUTES_HPP
+#define UI_SIMPLE_C_SIMPLE_FONT_STRING_ATTRIBUTES_HPP
 
-#include <cstdint>
 #include <common/String.hpp>
 #include <tempest/Vector.hpp>
+#include <cstdint>
 
 class CSimpleFontString;
 
diff --git a/src/ui/CSimpleFontStringScript.cpp b/src/ui/simple/CSimpleFontStringScript.cpp
similarity index 98%
rename from src/ui/CSimpleFontStringScript.cpp
rename to src/ui/simple/CSimpleFontStringScript.cpp
index fa9ebb5..b5e15a9 100644
--- a/src/ui/CSimpleFontStringScript.cpp
+++ b/src/ui/simple/CSimpleFontStringScript.cpp
@@ -1,6 +1,6 @@
-#include "ui/CSimpleFontStringScript.hpp"
-#include "ui/CSimpleFont.hpp"
-#include "ui/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFontStringScript.hpp"
+#include "ui/simple/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
 #include "util/Unimplemented.hpp"
diff --git a/src/ui/CSimpleFontStringScript.hpp b/src/ui/simple/CSimpleFontStringScript.hpp
similarity index 64%
rename from src/ui/CSimpleFontStringScript.hpp
rename to src/ui/simple/CSimpleFontStringScript.hpp
index 914aca3..5800103 100644
--- a/src/ui/CSimpleFontStringScript.hpp
+++ b/src/ui/simple/CSimpleFontStringScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_FONT_STRING_SCRIPT_HPP
-#define UI_C_SIMPLE_FONT_STRING_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONT_STRING_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_FONT_STRING_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleFontable.cpp b/src/ui/simple/CSimpleFontable.cpp
similarity index 90%
rename from src/ui/CSimpleFontable.cpp
rename to src/ui/simple/CSimpleFontable.cpp
index 8d16113..4155d32 100644
--- a/src/ui/CSimpleFontable.cpp
+++ b/src/ui/simple/CSimpleFontable.cpp
@@ -1,5 +1,5 @@
-#include "ui/CSimpleFontable.hpp"
-#include "ui/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFontable.hpp"
+#include "ui/simple/CSimpleFont.hpp"
 
 CSimpleFontable::~CSimpleFontable() {
     this->SetFontObject(nullptr);
diff --git a/src/ui/CSimpleFontable.hpp b/src/ui/simple/CSimpleFontable.hpp
similarity index 88%
rename from src/ui/CSimpleFontable.hpp
rename to src/ui/simple/CSimpleFontable.hpp
index 9740d31..9f7e07b 100644
--- a/src/ui/CSimpleFontable.hpp
+++ b/src/ui/simple/CSimpleFontable.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_FONTABLE_HPP
-#define UI_C_SIMPLE_FONTABLE_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONTABLE_HPP
+#define UI_SIMPLE_C_SIMPLE_FONTABLE_HPP
 
 #include "ui/Types.hpp"
 #include <storm/List.hpp>
diff --git a/src/ui/CSimpleFontedFrame.hpp b/src/ui/simple/CSimpleFontedFrame.hpp
similarity index 70%
rename from src/ui/CSimpleFontedFrame.hpp
rename to src/ui/simple/CSimpleFontedFrame.hpp
index fcffd82..bc63980 100644
--- a/src/ui/CSimpleFontedFrame.hpp
+++ b/src/ui/simple/CSimpleFontedFrame.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_FONTED_FRAME_HPP
-#define UI_C_SIMPLE_FONTED_FRAME_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONTED_FRAME_HPP
+#define UI_SIMPLE_C_SIMPLE_FONTED_FRAME_HPP
 
 #include <cstdint>
 
diff --git a/src/ui/CSimpleFontedFrameFont.hpp b/src/ui/simple/CSimpleFontedFrameFont.hpp
similarity index 69%
rename from src/ui/CSimpleFontedFrameFont.hpp
rename to src/ui/simple/CSimpleFontedFrameFont.hpp
index dff18d1..1d85e04 100644
--- a/src/ui/CSimpleFontedFrameFont.hpp
+++ b/src/ui/simple/CSimpleFontedFrameFont.hpp
@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_FONTED_FRAME_FONT_HPP
-#define UI_C_SIMPLE_FONTED_FRAME_FONT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FONTED_FRAME_FONT_HPP
+#define UI_SIMPLE_C_SIMPLE_FONTED_FRAME_FONT_HPP
 
-#include "ui/CSimpleFont.hpp"
+#include "ui/simple/CSimpleFont.hpp"
 
 class CSimpleFontedFrame;
 
diff --git a/src/ui/CSimpleFrame.cpp b/src/ui/simple/CSimpleFrame.cpp
similarity index 99%
rename from src/ui/CSimpleFrame.cpp
rename to src/ui/simple/CSimpleFrame.cpp
index c7801a5..302c3f5 100644
--- a/src/ui/CSimpleFrame.cpp
+++ b/src/ui/simple/CSimpleFrame.cpp
@@ -1,27 +1,27 @@
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include "event/Event.hpp"
 #include "event/Input.hpp"
 #include "gx/Coordinate.hpp"
 #include "math/Utils.hpp"
 #include "ui/CBackdropGenerator.hpp"
 #include "ui/CScriptRegion.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleFrameScript.hpp"
-#include "ui/CSimpleRender.hpp"
-#include "ui/CSimpleScrollFrame.hpp"
-#include "ui/CSimpleTitleRegion.hpp"
-#include "ui/CSimpleTexture.hpp"
-#include "ui/CSimpleTop.hpp"
 #include "ui/FrameScript_Object.hpp"
 #include "ui/FrameXML.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFrameScript.hpp"
+#include "ui/simple/CSimpleRender.hpp"
+#include "ui/simple/CSimpleScrollFrame.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTitleRegion.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
-#include <algorithm>
 #include <common/XML.hpp>
 #include <storm/Error.hpp>
 #include <storm/String.hpp>
 #include <storm/Unicode.hpp>
+#include <algorithm>
 
 int32_t CSimpleFrame::s_metatable;
 int32_t CSimpleFrame::s_objectType;
diff --git a/src/ui/CSimpleFrame.hpp b/src/ui/simple/CSimpleFrame.hpp
similarity index 98%
rename from src/ui/CSimpleFrame.hpp
rename to src/ui/simple/CSimpleFrame.hpp
index 25ffe48..ee85636 100644
--- a/src/ui/CSimpleFrame.hpp
+++ b/src/ui/simple/CSimpleFrame.hpp
@@ -1,13 +1,13 @@
-#ifndef UI_C_SIMPLE_FRAME_HPP
-#define UI_C_SIMPLE_FRAME_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FRAME_HPP
+#define UI_SIMPLE_C_SIMPLE_FRAME_HPP
 
 #include "event/CEvent.hpp"
 #include "ui/CRenderBatch.hpp"
 #include "ui/CScriptRegion.hpp"
-#include "ui/CSimpleRegion.hpp"
 #include "ui/Types.hpp"
-#include <cstdint>
+#include "ui/simple/CSimpleRegion.hpp"
 #include <storm/List.hpp>
+#include <cstdint>
 
 class CBackdropGenerator;
 class CCharEvent;
diff --git a/src/ui/CSimpleFrameScript.cpp b/src/ui/simple/CSimpleFrameScript.cpp
similarity index 99%
rename from src/ui/CSimpleFrameScript.cpp
rename to src/ui/simple/CSimpleFrameScript.cpp
index 7fded78..2b63fb0 100644
--- a/src/ui/CSimpleFrameScript.cpp
+++ b/src/ui/simple/CSimpleFrameScript.cpp
@@ -1,8 +1,8 @@
-#include "ui/CSimpleFrameScript.hpp"
+#include "ui/simple/CSimpleFrameScript.hpp"
 #include "gx/Coordinate.hpp"
 #include "ui/CBackdropGenerator.hpp"
-#include "ui/CSimpleFrame.hpp"
 #include "ui/FrameScript.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <algorithm>
diff --git a/src/ui/CSimpleFrameScript.hpp b/src/ui/simple/CSimpleFrameScript.hpp
similarity index 64%
rename from src/ui/CSimpleFrameScript.hpp
rename to src/ui/simple/CSimpleFrameScript.hpp
index 6a4d38f..718080e 100644
--- a/src/ui/CSimpleFrameScript.hpp
+++ b/src/ui/simple/CSimpleFrameScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_FRAME_SCRIPT_HPP
-#define UI_C_SIMPLE_FRAME_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_FRAME_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_FRAME_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleHTML.cpp b/src/ui/simple/CSimpleHTML.cpp
similarity index 98%
rename from src/ui/CSimpleHTML.cpp
rename to src/ui/simple/CSimpleHTML.cpp
index 941236e..f6e6934 100644
--- a/src/ui/CSimpleHTML.cpp
+++ b/src/ui/simple/CSimpleHTML.cpp
@@ -1,8 +1,8 @@
-#include "ui/CSimpleHTML.hpp"
-#include "ui/CSimpleFontedFrameFont.hpp"
-#include "ui/CSimpleFontString.hpp"
-#include "ui/CSimpleHTMLScript.hpp"
-#include "ui/CSimpleTop.hpp"
+#include "ui/simple/CSimpleHTML.hpp"
+#include "ui/simple/CSimpleFontString.hpp"
+#include "ui/simple/CSimpleFontedFrameFont.hpp"
+#include "ui/simple/CSimpleHTMLScript.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "util/CStatus.hpp"
 #include "util/SFile.hpp"
 #include "util/StringTo.hpp"
diff --git a/src/ui/CSimpleHTML.hpp b/src/ui/simple/CSimpleHTML.hpp
similarity index 89%
rename from src/ui/CSimpleHTML.hpp
rename to src/ui/simple/CSimpleHTML.hpp
index b83a56f..676b82f 100644
--- a/src/ui/CSimpleHTML.hpp
+++ b/src/ui/simple/CSimpleHTML.hpp
@@ -1,9 +1,9 @@
-#ifndef UI_C_SIMPLE_HTML_HPP
-#define UI_C_SIMPLE_HTML_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_HTML_HPP
+#define UI_SIMPLE_C_SIMPLE_HTML_HPP
 
-#include "ui/CSimpleFontedFrame.hpp"
-#include "ui/CSimpleHyperlinkedFrame.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleFontedFrame.hpp"
+#include "ui/simple/CSimpleHyperlinkedFrame.hpp"
 #include <storm/List.hpp>
 
 class CStatus;
diff --git a/src/ui/CSimpleHTMLScript.cpp b/src/ui/simple/CSimpleHTMLScript.cpp
similarity index 97%
rename from src/ui/CSimpleHTMLScript.cpp
rename to src/ui/simple/CSimpleHTMLScript.cpp
index d56eab7..1784500 100644
--- a/src/ui/CSimpleHTMLScript.cpp
+++ b/src/ui/simple/CSimpleHTMLScript.cpp
@@ -1,5 +1,5 @@
-#include "ui/CSimpleHTMLScript.hpp"
-#include "ui/CSimpleHTML.hpp"
+#include "ui/simple/CSimpleHTMLScript.hpp"
+#include "ui/simple/CSimpleHTML.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>
diff --git a/src/ui/CSimpleHTMLScript.hpp b/src/ui/simple/CSimpleHTMLScript.hpp
similarity index 65%
rename from src/ui/CSimpleHTMLScript.hpp
rename to src/ui/simple/CSimpleHTMLScript.hpp
index 1abc13b..5101111 100644
--- a/src/ui/CSimpleHTMLScript.hpp
+++ b/src/ui/simple/CSimpleHTMLScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_HTML_SCRIPT_HPP
-#define UI_C_SIMPLE_HTML_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_HTML_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_HTML_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleHyperlinkedFrame.cpp b/src/ui/simple/CSimpleHyperlinkedFrame.cpp
similarity index 69%
rename from src/ui/CSimpleHyperlinkedFrame.cpp
rename to src/ui/simple/CSimpleHyperlinkedFrame.cpp
index ffc398f..3c8a3b1 100644
--- a/src/ui/CSimpleHyperlinkedFrame.cpp
+++ b/src/ui/simple/CSimpleHyperlinkedFrame.cpp
@@ -1,4 +1,4 @@
-#include "ui/CSimpleHyperlinkedFrame.hpp"
+#include "ui/simple/CSimpleHyperlinkedFrame.hpp"
 
 CSimpleHyperlinkedFrame::CSimpleHyperlinkedFrame(CSimpleFrame* parent) : CSimpleFrame(parent) {
     // TODO
diff --git a/src/ui/CSimpleHyperlinkedFrame.hpp b/src/ui/simple/CSimpleHyperlinkedFrame.hpp
similarity index 54%
rename from src/ui/CSimpleHyperlinkedFrame.hpp
rename to src/ui/simple/CSimpleHyperlinkedFrame.hpp
index 0c8aa10..4cf6c80 100644
--- a/src/ui/CSimpleHyperlinkedFrame.hpp
+++ b/src/ui/simple/CSimpleHyperlinkedFrame.hpp
@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_HYPERLINKED_FRAME_HPP
-#define UI_C_SIMPLE_HYPERLINKED_FRAME_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_HYPERLINKED_FRAME_HPP
+#define UI_SIMPLE_C_SIMPLE_HYPERLINKED_FRAME_HPP
 
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 
 class CSimpleHyperlinkedFrame : public CSimpleFrame {
     public:
diff --git a/src/ui/CSimpleModel.cpp b/src/ui/simple/CSimpleModel.cpp
similarity index 99%
rename from src/ui/CSimpleModel.cpp
rename to src/ui/simple/CSimpleModel.cpp
index 6e31aca..6a3bee8 100644
--- a/src/ui/CSimpleModel.cpp
+++ b/src/ui/simple/CSimpleModel.cpp
@@ -1,4 +1,4 @@
-#include "ui/CSimpleModel.hpp"
+#include "ui/simple/CSimpleModel.hpp"
 #include "gx/Camera.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Draw.hpp"
@@ -7,8 +7,8 @@
 #include "math/Utils.hpp"
 #include "model/CM2Shared.hpp"
 #include "model/M2Data.hpp"
-#include "ui/CSimpleModelScript.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleModelScript.hpp"
 #include <common/XML.hpp>
 #include <tempest/Math.hpp>
 
diff --git a/src/ui/CSimpleModel.hpp b/src/ui/simple/CSimpleModel.hpp
similarity index 95%
rename from src/ui/CSimpleModel.hpp
rename to src/ui/simple/CSimpleModel.hpp
index 7f1959b..2aac83c 100644
--- a/src/ui/CSimpleModel.hpp
+++ b/src/ui/simple/CSimpleModel.hpp
@@ -1,11 +1,11 @@
-#ifndef C_SIMPLE_MODEL_HPP
-#define C_SIMPLE_MODEL_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_MODEL_HPP
+#define UI_SIMPLE_C_SIMPLE_MODEL_HPP
 
 #include "gx/Camera.hpp"
-#include "ui/CSimpleFrame.hpp"
 #include "model/Model2.hpp"
-#include <tempest/Vector.hpp>
+#include "ui/simple/CSimpleFrame.hpp"
 #include <tempest/Box.hpp>
+#include <tempest/Vector.hpp>
 
 class CStatus;
 class XMLNode;
diff --git a/src/ui/CSimpleModelFFX.cpp b/src/ui/simple/CSimpleModelFFX.cpp
similarity index 94%
rename from src/ui/CSimpleModelFFX.cpp
rename to src/ui/simple/CSimpleModelFFX.cpp
index 95b3f62..59e61b7 100644
--- a/src/ui/CSimpleModelFFX.cpp
+++ b/src/ui/simple/CSimpleModelFFX.cpp
@@ -1,7 +1,7 @@
-#include "ui/CSimpleModelFFX.hpp"
+#include "ui/simple/CSimpleModelFFX.hpp"
 #include "gx/Draw.hpp"
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleModelFFXScript.hpp"
+#include "ui/simple/CSimpleModelFFXScript.hpp"
 #include <storm/Memory.hpp>
 
 int32_t CSimpleModelFFX::s_metatable;
diff --git a/src/ui/CSimpleModelFFX.hpp b/src/ui/simple/CSimpleModelFFX.hpp
similarity index 83%
rename from src/ui/CSimpleModelFFX.hpp
rename to src/ui/simple/CSimpleModelFFX.hpp
index 1a4a3fd..746d620 100644
--- a/src/ui/CSimpleModelFFX.hpp
+++ b/src/ui/simple/CSimpleModelFFX.hpp
@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_MODEL_FFX_HPP
-#define UI_C_SIMPLE_MODEL_FFX_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_MODEL_FFX_HPP
+#define UI_SIMPLE_C_SIMPLE_MODEL_FFX_HPP
 
-#include "ui/CSimpleModel.hpp"
+#include "ui/simple/CSimpleModel.hpp"
 
 class CSimpleFrame;
 
diff --git a/src/ui/CSimpleModelFFXScript.cpp b/src/ui/simple/CSimpleModelFFXScript.cpp
similarity index 93%
rename from src/ui/CSimpleModelFFXScript.cpp
rename to src/ui/simple/CSimpleModelFFXScript.cpp
index 1d5daf4..8c0eb2b 100644
--- a/src/ui/CSimpleModelFFXScript.cpp
+++ b/src/ui/simple/CSimpleModelFFXScript.cpp
@@ -1,4 +1,4 @@
-#include "ui/CSimpleModelFFXScript.hpp"
+#include "ui/simple/CSimpleModelFFXScript.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>
 
diff --git a/src/ui/CSimpleModelFFXScript.hpp b/src/ui/simple/CSimpleModelFFXScript.hpp
similarity index 64%
rename from src/ui/CSimpleModelFFXScript.hpp
rename to src/ui/simple/CSimpleModelFFXScript.hpp
index 4e9a0df..7cb30aa 100644
--- a/src/ui/CSimpleModelFFXScript.hpp
+++ b/src/ui/simple/CSimpleModelFFXScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_MODEL_FFX_SCRIPT_HPP
-#define UI_C_SIMPLE_MODEL_FFX_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_MODEL_FFX_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_MODEL_FFX_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleModelScript.cpp b/src/ui/simple/CSimpleModelScript.cpp
similarity index 98%
rename from src/ui/CSimpleModelScript.cpp
rename to src/ui/simple/CSimpleModelScript.cpp
index 5069035..c674c1f 100644
--- a/src/ui/CSimpleModelScript.cpp
+++ b/src/ui/simple/CSimpleModelScript.cpp
@@ -1,5 +1,5 @@
-#include "ui/CSimpleModelScript.hpp"
-#include "ui/CSimpleModel.hpp"
+#include "ui/simple/CSimpleModelScript.hpp"
+#include "ui/simple/CSimpleModel.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>
diff --git a/src/ui/CSimpleModelScript.hpp b/src/ui/simple/CSimpleModelScript.hpp
similarity index 64%
rename from src/ui/CSimpleModelScript.hpp
rename to src/ui/simple/CSimpleModelScript.hpp
index 53ba4fc..7fa4311 100644
--- a/src/ui/CSimpleModelScript.hpp
+++ b/src/ui/simple/CSimpleModelScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_MODEL_SCRIPT_HPP
-#define UI_C_SIMPLE_MODEL_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_MODEL_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_MODEL_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleRegion.cpp b/src/ui/simple/CSimpleRegion.cpp
similarity index 98%
rename from src/ui/CSimpleRegion.cpp
rename to src/ui/simple/CSimpleRegion.cpp
index 323495f..90e328f 100644
--- a/src/ui/CSimpleRegion.cpp
+++ b/src/ui/simple/CSimpleRegion.cpp
@@ -1,5 +1,5 @@
-#include "ui/CSimpleRegion.hpp"
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleRegion.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include <cstring>
 
 CSimpleRegion::~CSimpleRegion() {
diff --git a/src/ui/CSimpleRegion.hpp b/src/ui/simple/CSimpleRegion.hpp
similarity index 93%
rename from src/ui/CSimpleRegion.hpp
rename to src/ui/simple/CSimpleRegion.hpp
index ae77d88..3d6bc42 100644
--- a/src/ui/CSimpleRegion.hpp
+++ b/src/ui/simple/CSimpleRegion.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_REGION_HPP
-#define UI_C_SIMPLE_REGION_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_REGION_HPP
+#define UI_SIMPLE_C_SIMPLE_REGION_HPP
 
 #include "ui/CScriptRegion.hpp"
 #include <storm/List.hpp>
diff --git a/src/ui/CSimpleRender.cpp b/src/ui/simple/CSimpleRender.cpp
similarity index 99%
rename from src/ui/CSimpleRender.cpp
rename to src/ui/simple/CSimpleRender.cpp
index 02b6011..8ce2d6e 100644
--- a/src/ui/CSimpleRender.cpp
+++ b/src/ui/simple/CSimpleRender.cpp
@@ -1,4 +1,4 @@
-#include "ui/CSimpleRender.hpp"
+#include "ui/simple/CSimpleRender.hpp"
 #include "gx/Buffer.hpp"
 #include "gx/Device.hpp"
 #include "gx/Draw.hpp"
diff --git a/src/ui/CSimpleRender.hpp b/src/ui/simple/CSimpleRender.hpp
similarity index 77%
rename from src/ui/CSimpleRender.hpp
rename to src/ui/simple/CSimpleRender.hpp
index b3a7357..48df08b 100644
--- a/src/ui/CSimpleRender.hpp
+++ b/src/ui/simple/CSimpleRender.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_RENDER_HPP
-#define UI_C_SIMPLE_RENDER_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_RENDER_HPP
+#define UI_SIMPLE_C_SIMPLE_RENDER_HPP
 
 class CGxShader;
 class CRenderBatch;
diff --git a/src/ui/CSimpleScrollFrame.cpp b/src/ui/simple/CSimpleScrollFrame.cpp
similarity index 99%
rename from src/ui/CSimpleScrollFrame.cpp
rename to src/ui/simple/CSimpleScrollFrame.cpp
index 93dbc9d..8631b83 100644
--- a/src/ui/CSimpleScrollFrame.cpp
+++ b/src/ui/simple/CSimpleScrollFrame.cpp
@@ -1,16 +1,16 @@
-#include "ui/CSimpleScrollFrame.hpp"
+#include "ui/simple/CSimpleScrollFrame.hpp"
 #include "gx/Camera.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Transform.hpp"
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleScrollFrameScript.hpp"
 #include "ui/FrameXML.hpp"
+#include "ui/simple/CSimpleScrollFrameScript.hpp"
 #include "util/CStatus.hpp"
 #include "util/Lua.hpp"
-#include <cmath>
-#include <limits>
 #include <common/XML.hpp>
 #include <tempest/Matrix.hpp>
+#include <cmath>
+#include <limits>
 
 int32_t CSimpleScrollFrame::s_metatable;
 int32_t CSimpleScrollFrame::s_objectType;
diff --git a/src/ui/CSimpleScrollFrame.hpp b/src/ui/simple/CSimpleScrollFrame.hpp
similarity index 92%
rename from src/ui/CSimpleScrollFrame.hpp
rename to src/ui/simple/CSimpleScrollFrame.hpp
index e726749..1238941 100644
--- a/src/ui/CSimpleScrollFrame.hpp
+++ b/src/ui/simple/CSimpleScrollFrame.hpp
@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_SCROLL_FRAME_HPP
-#define UI_C_SIMPLE_SCROLL_FRAME_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_SCROLL_FRAME_HPP
+#define UI_SIMPLE_C_SIMPLE_SCROLL_FRAME_HPP
 
-#include "ui/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
 #include <tempest/Vector.hpp>
 
 class CRect;
diff --git a/src/ui/CSimpleScrollFrameScript.cpp b/src/ui/simple/CSimpleScrollFrameScript.cpp
similarity index 97%
rename from src/ui/CSimpleScrollFrameScript.cpp
rename to src/ui/simple/CSimpleScrollFrameScript.cpp
index e8f9ed9..60e7ec0 100644
--- a/src/ui/CSimpleScrollFrameScript.cpp
+++ b/src/ui/simple/CSimpleScrollFrameScript.cpp
@@ -1,6 +1,6 @@
-#include "ui/CSimpleScrollFrameScript.hpp"
+#include "ui/simple/CSimpleScrollFrameScript.hpp"
 #include "gx/Coordinate.hpp"
-#include "ui/CSimpleScrollFrame.hpp"
+#include "ui/simple/CSimpleScrollFrame.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>
diff --git a/src/ui/CSimpleScrollFrameScript.hpp b/src/ui/simple/CSimpleScrollFrameScript.hpp
similarity index 64%
rename from src/ui/CSimpleScrollFrameScript.hpp
rename to src/ui/simple/CSimpleScrollFrameScript.hpp
index 907fc12..a6425eb 100644
--- a/src/ui/CSimpleScrollFrameScript.hpp
+++ b/src/ui/simple/CSimpleScrollFrameScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_SCROLL_FRAME_SCRIPT_HPP
-#define UI_C_SIMPLE_SCROLL_FRAME_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_SCROLL_FRAME_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_SCROLL_FRAME_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleSlider.cpp b/src/ui/simple/CSimpleSlider.cpp
similarity index 98%
rename from src/ui/CSimpleSlider.cpp
rename to src/ui/simple/CSimpleSlider.cpp
index bffae29..97d2612 100644
--- a/src/ui/CSimpleSlider.cpp
+++ b/src/ui/simple/CSimpleSlider.cpp
@@ -1,8 +1,8 @@
-#include "ui/CSimpleSlider.hpp"
+#include "ui/simple/CSimpleSlider.hpp"
 #include "math/Utils.hpp"
-#include "ui/CSimpleSliderScript.hpp"
-#include "ui/CSimpleTexture.hpp"
 #include "ui/LoadXML.hpp"
+#include "ui/simple/CSimpleSliderScript.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "util/Lua.hpp"
 #include "util/StringTo.hpp"
 #include <common/XML.hpp>
diff --git a/src/ui/CSimpleSlider.hpp b/src/ui/simple/CSimpleSlider.hpp
similarity index 95%
rename from src/ui/CSimpleSlider.hpp
rename to src/ui/simple/CSimpleSlider.hpp
index d707c33..c7db193 100644
--- a/src/ui/CSimpleSlider.hpp
+++ b/src/ui/simple/CSimpleSlider.hpp
@@ -1,7 +1,7 @@
-#ifndef UI_C_SIMPLE_SLIDER_HPP
-#define UI_C_SIMPLE_SLIDER_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_SLIDER_HPP
+#define UI_SIMPLE_C_SIMPLE_SLIDER_HPP
 
-#include "ui/CSimpleFrame.hpp"
+#include "CSimpleFrame.hpp"
 
 class CSimpleSlider : public CSimpleFrame {
     public:
diff --git a/src/ui/CSimpleSliderScript.cpp b/src/ui/simple/CSimpleSliderScript.cpp
similarity index 97%
rename from src/ui/CSimpleSliderScript.cpp
rename to src/ui/simple/CSimpleSliderScript.cpp
index 0949fdb..993e408 100644
--- a/src/ui/CSimpleSliderScript.cpp
+++ b/src/ui/simple/CSimpleSliderScript.cpp
@@ -1,5 +1,5 @@
-#include "ui/CSimpleSliderScript.hpp"
-#include "ui/CSimpleSlider.hpp"
+#include "ui/simple/CSimpleSliderScript.hpp"
+#include "ui/simple/CSimpleSlider.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>
diff --git a/src/ui/CSimpleSliderScript.hpp b/src/ui/simple/CSimpleSliderScript.hpp
similarity index 64%
rename from src/ui/CSimpleSliderScript.hpp
rename to src/ui/simple/CSimpleSliderScript.hpp
index c1c4dbc..2254a2e 100644
--- a/src/ui/CSimpleSliderScript.hpp
+++ b/src/ui/simple/CSimpleSliderScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_SLIDER_SCRIPT_HPP
-#define UI_C_SIMPLE_SLIDER_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_SLIDER_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_SLIDER_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleTexture.cpp b/src/ui/simple/CSimpleTexture.cpp
similarity index 99%
rename from src/ui/CSimpleTexture.cpp
rename to src/ui/simple/CSimpleTexture.cpp
index 274f880..d22351f 100644
--- a/src/ui/CSimpleTexture.cpp
+++ b/src/ui/simple/CSimpleTexture.cpp
@@ -1,14 +1,14 @@
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Device.hpp"
 #include "gx/Shader.hpp"
 #include "ui/CFramePoint.hpp"
 #include "ui/CRenderBatch.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleTextureScript.hpp"
 #include "ui/FrameXML.hpp"
 #include "ui/LoadXML.hpp"
 #include "ui/Util.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleTextureScript.hpp"
 #include "util/StringTo.hpp"
 #include <algorithm>
 #include <climits>
diff --git a/src/ui/CSimpleTexture.hpp b/src/ui/simple/CSimpleTexture.hpp
similarity index 94%
rename from src/ui/CSimpleTexture.hpp
rename to src/ui/simple/CSimpleTexture.hpp
index dbdff84..354c56f 100644
--- a/src/ui/CSimpleTexture.hpp
+++ b/src/ui/simple/CSimpleTexture.hpp
@@ -1,9 +1,9 @@
-#ifndef UI_C_SIMPLE_TEXTURE_HPP
-#define UI_C_SIMPLE_TEXTURE_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_TEXTURE_HPP
+#define UI_SIMPLE_C_SIMPLE_TEXTURE_HPP
 
 #include "gx/Texture.hpp"
-#include "ui/CSimpleRegion.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleRegion.hpp"
 #include <tempest/Vector.hpp>
 
 class CGxShader;
diff --git a/src/ui/CSimpleTextureScript.cpp b/src/ui/simple/CSimpleTextureScript.cpp
similarity index 98%
rename from src/ui/CSimpleTextureScript.cpp
rename to src/ui/simple/CSimpleTextureScript.cpp
index b4b066b..4ff62bc 100644
--- a/src/ui/CSimpleTextureScript.cpp
+++ b/src/ui/simple/CSimpleTextureScript.cpp
@@ -1,6 +1,6 @@
-#include "ui/CSimpleTextureScript.hpp"
-#include "ui/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTextureScript.hpp"
 #include "ui/Types.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
 #include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 #include <cstdint>
diff --git a/src/ui/CSimpleTextureScript.hpp b/src/ui/simple/CSimpleTextureScript.hpp
similarity index 64%
rename from src/ui/CSimpleTextureScript.hpp
rename to src/ui/simple/CSimpleTextureScript.hpp
index 9b16941..a5cf521 100644
--- a/src/ui/CSimpleTextureScript.hpp
+++ b/src/ui/simple/CSimpleTextureScript.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_TEXTURE_SCRIPT_HPP
-#define UI_C_SIMPLE_TEXTURE_SCRIPT_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_TEXTURE_SCRIPT_HPP
+#define UI_SIMPLE_C_SIMPLE_TEXTURE_SCRIPT_HPP
 
 #include "ui/FrameScript.hpp"
 
diff --git a/src/ui/CSimpleTitleRegion.hpp b/src/ui/simple/CSimpleTitleRegion.hpp
similarity index 54%
rename from src/ui/CSimpleTitleRegion.hpp
rename to src/ui/simple/CSimpleTitleRegion.hpp
index 554f66d..06e0699 100644
--- a/src/ui/CSimpleTitleRegion.hpp
+++ b/src/ui/simple/CSimpleTitleRegion.hpp
@@ -1,5 +1,5 @@
-#ifndef UI_C_SIMPLE_TITLE_REGION_HPP
-#define UI_C_SIMPLE_TITLE_REGION_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_TITLE_REGION_HPP
+#define UI_SIMPLE_C_SIMPLE_TITLE_REGION_HPP
 
 #include "ui/CScriptRegion.hpp"
 
diff --git a/src/ui/CSimpleTop.cpp b/src/ui/simple/CSimpleTop.cpp
similarity index 98%
rename from src/ui/CSimpleTop.cpp
rename to src/ui/simple/CSimpleTop.cpp
index 24d466d..fa9903c 100644
--- a/src/ui/CSimpleTop.cpp
+++ b/src/ui/simple/CSimpleTop.cpp
@@ -1,13 +1,13 @@
-#include "ui/CSimpleTop.hpp"
+#include "ui/simple/CSimpleTop.hpp"
 #include "gx/Camera.hpp"
 #include "gx/Coordinate.hpp"
 #include "gx/Device.hpp"
 #include "gx/Font.hpp"
 #include "gx/Screen.hpp"
-#include "ui/CSimpleFrame.hpp"
-#include "ui/CSimpleRender.hpp"
-#include "ui/CSimpleTexture.hpp"
-#include "ui/CSimpleTitleRegion.hpp"
+#include "ui/simple/CSimpleFrame.hpp"
+#include "ui/simple/CSimpleRender.hpp"
+#include "ui/simple/CSimpleTexture.hpp"
+#include "ui/simple/CSimpleTitleRegion.hpp"
 #include <cstring>
 #include <tempest/Math.hpp>
 
diff --git a/src/ui/CSimpleTop.hpp b/src/ui/simple/CSimpleTop.hpp
similarity index 97%
rename from src/ui/CSimpleTop.hpp
rename to src/ui/simple/CSimpleTop.hpp
index 936252d..5f1ced1 100644
--- a/src/ui/CSimpleTop.hpp
+++ b/src/ui/simple/CSimpleTop.hpp
@@ -1,14 +1,15 @@
-#ifndef UI_C_SIMPLE_TOP_HPP
-#define UI_C_SIMPLE_TOP_HPP
+#ifndef UI_SIMPLE_C_SIMPLE_TOP_HPP
+#define UI_SIMPLE_C_SIMPLE_TOP_HPP
 
 #include "event/Event.hpp"
 #include "gx/Screen.hpp"
 #include "ui/CFrameStrata.hpp"
 #include "ui/CLayoutFrame.hpp"
-#include "ui/CSimpleFrame.hpp"
 #include "ui/FrameScript.hpp"
 #include <common/Array.hpp>
 
+class CSimpleFrame;
+
 enum MOVERESIZE_REASON {
     MOVERESIZE_REASON0 = 0,
     MOVERESIZE_REASON1 = 1,