diff --git a/game/menu/Menu.tscn b/game/menu/Menu.tscn
index 1bf26e26..4c6ec7f4 100644
--- a/game/menu/Menu.tscn
+++ b/game/menu/Menu.tscn
@@ -7,7 +7,7 @@
 [ext_resource path="res://scenes/CharacterSelectorMenu.gd" type="Script" id=5]
 [ext_resource path="res://scenes/CharacterCreationMenu.gd" type="Script" id=6]
 [ext_resource path="res://ui/player/menu/character_creation_button_group.tres" type="ButtonGroup" id=7]
-[ext_resource path="res://ui/options/Options.tscn" type="PackedScene" id=8]
+[ext_resource path="res://ui/windows/options/Options.tscn" type="PackedScene" id=8]
 [ext_resource path="res://ui/register/Register.tscn" type="PackedScene" id=9]
 [ext_resource path="res://ui/login/Login.tscn" type="PackedScene" id=10]
 [ext_resource path="res://scenes/ConnectButton.gd" type="Script" id=11]
@@ -19,7 +19,7 @@
 [ext_resource path="res://tw/new_terramanlibrarymerger.tres" type="TerrainLibraryMerger" id=17]
 [ext_resource path="res://tw/new_terramanlevelgenerator.tres" type="TerrainLevelGenerator" id=18]
 [ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=19]
-[ext_resource path="res://ui/about/About.tscn" type="PackedScene" id=20]
+[ext_resource path="res://ui/windows/about/About.tscn" type="PackedScene" id=20]
 [ext_resource path="res://menu/ExitButton.gd" type="Script" id=21]
 [ext_resource path="res://ui/scripts/Window.gd" type="Script" id=22]
 
diff --git a/game/ui/ingame_menu/IngameMenu.tscn b/game/ui/ingame_menu/IngameMenu.tscn
index 45ea6e43..673e9587 100644
--- a/game/ui/ingame_menu/IngameMenu.tscn
+++ b/game/ui/ingame_menu/IngameMenu.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/options/Options.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/windows/options/Options.tscn" type="PackedScene" id=2]
 [ext_resource path="res://ui/ingame_menu/ExitButton.gd" type="Script" id=3]
-[ext_resource path="res://ui/keybinds/Keybinds.tscn" type="PackedScene" id=4]
+[ext_resource path="res://ui/windows/keybinds/Keybinds.tscn" type="PackedScene" id=4]
 [ext_resource path="res://ui/interface/InterfaceOptions.tscn" type="PackedScene" id=5]
 
 [node name="IngameMenu" type="Control"]
@@ -99,6 +99,7 @@ margin_left = -331.0
 margin_top = -224.5
 margin_right = 331.0
 margin_bottom = 224.5
+
 [connection signal="pressed" from="Menu/VBoxContainer/Resume" to="." method="hide"]
 [connection signal="pressed" from="Menu/VBoxContainer/Keybinds" to="KeybindWindow" method="show"]
 [connection signal="pressed" from="Menu/VBoxContainer/Interface" to="InterfaceOptions" method="show"]
diff --git a/game/ui/about/About.tscn b/game/ui/windows/about/About.tscn
similarity index 94%
rename from game/ui/about/About.tscn
rename to game/ui/windows/about/About.tscn
index f3403530..04de4672 100644
--- a/game/ui/about/About.tscn
+++ b/game/ui/windows/about/About.tscn
@@ -1,12 +1,12 @@
 [gd_scene load_steps=10 format=2]
 
-[ext_resource path="res://ui/about/GodotAuthors.gd" type="Script" id=1]
-[ext_resource path="res://ui/about/GodotDonors.gd" type="Script" id=2]
+[ext_resource path="res://ui/windows/about/GodotAuthors.gd" type="Script" id=1]
+[ext_resource path="res://ui/windows/about/GodotDonors.gd" type="Script" id=2]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=3]
-[ext_resource path="res://ui/about/GodotLicense.gd" type="Script" id=4]
-[ext_resource path="res://ui/about/GodotThirdPartyLicenses.gd" type="Script" id=5]
-[ext_resource path="res://ui/about/Authors.gd" type="Script" id=6]
-[ext_resource path="res://ui/about/Third-Party Licenses.gd" type="Script" id=7]
+[ext_resource path="res://ui/windows/about/GodotLicense.gd" type="Script" id=4]
+[ext_resource path="res://ui/windows/about/GodotThirdPartyLicenses.gd" type="Script" id=5]
+[ext_resource path="res://ui/windows/about/Authors.gd" type="Script" id=6]
+[ext_resource path="res://ui/windows/about/Third-Party Licenses.gd" type="Script" id=7]
 [ext_resource path="res://ui/scripts/Window.gd" type="Script" id=8]
 [ext_resource path="res://ui/scripts/KeyboardTabContainer.gd" type="Script" id=9]
 
diff --git a/game/ui/about/Authors.gd b/game/ui/windows/about/Authors.gd
similarity index 100%
rename from game/ui/about/Authors.gd
rename to game/ui/windows/about/Authors.gd
diff --git a/game/ui/about/GodotAuthors.gd b/game/ui/windows/about/GodotAuthors.gd
similarity index 100%
rename from game/ui/about/GodotAuthors.gd
rename to game/ui/windows/about/GodotAuthors.gd
diff --git a/game/ui/about/GodotDonors.gd b/game/ui/windows/about/GodotDonors.gd
similarity index 100%
rename from game/ui/about/GodotDonors.gd
rename to game/ui/windows/about/GodotDonors.gd
diff --git a/game/ui/about/GodotLicense.gd b/game/ui/windows/about/GodotLicense.gd
similarity index 100%
rename from game/ui/about/GodotLicense.gd
rename to game/ui/windows/about/GodotLicense.gd
diff --git a/game/ui/about/GodotThirdPartyLicenses.gd b/game/ui/windows/about/GodotThirdPartyLicenses.gd
similarity index 100%
rename from game/ui/about/GodotThirdPartyLicenses.gd
rename to game/ui/windows/about/GodotThirdPartyLicenses.gd
diff --git a/game/ui/about/Third-Party Licenses.gd b/game/ui/windows/about/Third-Party Licenses.gd
similarity index 100%
rename from game/ui/about/Third-Party Licenses.gd
rename to game/ui/windows/about/Third-Party Licenses.gd
diff --git a/game/ui/keybinds/KeybindCategory.gd b/game/ui/windows/keybinds/KeybindCategory.gd
similarity index 100%
rename from game/ui/keybinds/KeybindCategory.gd
rename to game/ui/windows/keybinds/KeybindCategory.gd
diff --git a/game/ui/keybinds/KeybindCategory.tscn b/game/ui/windows/keybinds/KeybindCategory.tscn
similarity index 71%
rename from game/ui/keybinds/KeybindCategory.tscn
rename to game/ui/windows/keybinds/KeybindCategory.tscn
index f66ca13c..a47b75c1 100644
--- a/game/ui/keybinds/KeybindCategory.tscn
+++ b/game/ui/windows/keybinds/KeybindCategory.tscn
@@ -1,16 +1,16 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/keybinds/KeybindCategory.gd" type="Script" id=1]
-[ext_resource path="res://ui/keybinds/KeybindEntry.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/windows/keybinds/KeybindEntry.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/windows/keybinds/KeybindCategory.gd" type="Script" id=2]
 
 [node name="KeybindCategory" type="VBoxContainer"]
 margin_right = 1016.0
 margin_bottom = 23.0
-script = ExtResource( 1 )
+script = ExtResource( 2 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
-keybind_entry_scene = ExtResource( 2 )
+keybind_entry_scene = ExtResource( 1 )
 content_container_path = NodePath("VBoxContainer/content")
 
 [node name="Label" type="Label" parent="."]
diff --git a/game/ui/keybinds/KeybindEntry.gd b/game/ui/windows/keybinds/KeybindEntry.gd
similarity index 100%
rename from game/ui/keybinds/KeybindEntry.gd
rename to game/ui/windows/keybinds/KeybindEntry.gd
diff --git a/game/ui/keybinds/KeybindEntry.tscn b/game/ui/windows/keybinds/KeybindEntry.tscn
similarity index 90%
rename from game/ui/keybinds/KeybindEntry.tscn
rename to game/ui/windows/keybinds/KeybindEntry.tscn
index 9da6f5df..bcf83b64 100644
--- a/game/ui/keybinds/KeybindEntry.tscn
+++ b/game/ui/windows/keybinds/KeybindEntry.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/keybinds/KeybindEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/windows/keybinds/KeybindEntry.gd" type="Script" id=1]
 
 [node name="KeybindEntry" type="HBoxContainer"]
 margin_right = 996.0
@@ -30,5 +30,6 @@ margin_right = 996.0
 margin_bottom = 37.0
 rect_min_size = Vector2( 200, 30 )
 text = "empty"
+
 [connection signal="pressed" from="Button" to="." method="query_keybind_1"]
 [connection signal="pressed" from="Button2" to="." method="query_keybind_2"]
diff --git a/game/ui/keybinds/Keybinds.gd b/game/ui/windows/keybinds/Keybinds.gd
similarity index 100%
rename from game/ui/keybinds/Keybinds.gd
rename to game/ui/windows/keybinds/Keybinds.gd
diff --git a/game/ui/keybinds/Keybinds.tscn b/game/ui/windows/keybinds/Keybinds.tscn
similarity index 82%
rename from game/ui/keybinds/Keybinds.tscn
rename to game/ui/windows/keybinds/Keybinds.tscn
index c5046e3b..9420e969 100644
--- a/game/ui/keybinds/Keybinds.tscn
+++ b/game/ui/windows/keybinds/Keybinds.tscn
@@ -1,25 +1,25 @@
 [gd_scene load_steps=11 format=2]
 
-[ext_resource path="res://ui/keybinds/Keybinds.gd" type="Script" id=1]
-[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=2]
-[ext_resource path="res://ui/keybinds/KeybindCategory.tscn" type="PackedScene" id=3]
-[ext_resource path="res://ui/icons/icon_mouse.png" type="Texture" id=4]
-[ext_resource path="res://ui/icons/icon_keyboard.png" type="Texture" id=5]
-[ext_resource path="res://ui/icons/icon_joy_button.png" type="Texture" id=6]
-[ext_resource path="res://ui/icons/icon_remove.png" type="Texture" id=7]
-[ext_resource path="res://ui/icons/icon_add.png" type="Texture" id=8]
-[ext_resource path="res://ui/icons/icon_edit.png" type="Texture" id=9]
+[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
+[ext_resource path="res://ui/icons/icon_add.png" type="Texture" id=2]
+[ext_resource path="res://ui/icons/icon_edit.png" type="Texture" id=3]
+[ext_resource path="res://ui/icons/icon_remove.png" type="Texture" id=4]
+[ext_resource path="res://ui/windows/keybinds/KeybindCategory.tscn" type="PackedScene" id=5]
+[ext_resource path="res://ui/windows/keybinds/Keybinds.gd" type="Script" id=6]
+[ext_resource path="res://ui/icons/icon_joy_button.png" type="Texture" id=7]
+[ext_resource path="res://ui/icons/icon_mouse.png" type="Texture" id=8]
+[ext_resource path="res://ui/icons/icon_keyboard.png" type="Texture" id=9]
 [ext_resource path="res://ui/icons/icon_joy_axis.png" type="Texture" id=10]
 
 [node name="KeybindWindow" type="PanelContainer"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-theme = ExtResource( 2 )
-script = ExtResource( 1 )
+theme = ExtResource( 1 )
+script = ExtResource( 6 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
-keybind_category_scene = ExtResource( 3 )
+keybind_category_scene = ExtResource( 5 )
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 margin_left = 4.0
@@ -51,13 +51,13 @@ margin_right = 1016.0
 margin_bottom = 554.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-add_texture = ExtResource( 8 )
-remove_texture = ExtResource( 7 )
-edit_texture = ExtResource( 9 )
-keyboard_texture = ExtResource( 5 )
-joybutton_texture = ExtResource( 6 )
+add_texture = ExtResource( 2 )
+remove_texture = ExtResource( 4 )
+edit_texture = ExtResource( 3 )
+keyboard_texture = ExtResource( 9 )
+joybutton_texture = ExtResource( 7 )
 joyaxis_texture = ExtResource( 10 )
-mouse_texture = ExtResource( 4 )
+mouse_texture = ExtResource( 8 )
 
 [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"]
 margin_top = 562.0
@@ -78,6 +78,7 @@ margin_right = 1016.0
 margin_bottom = 30.0
 rect_min_size = Vector2( 80, 30 )
 text = "OK"
+
 [connection signal="pressed" from="VBoxContainer/HBoxContainer/Button" to="." method="hide"]
 [connection signal="pressed" from="VBoxContainer/HBoxContainer2/Button" to="." method="hide"]
 [connection signal="pressed" from="VBoxContainer/HBoxContainer2/Button2" to="." method="close"]
diff --git a/game/ui/options/OptionButtonRow.gd b/game/ui/windows/options/OptionButtonRow.gd
similarity index 100%
rename from game/ui/options/OptionButtonRow.gd
rename to game/ui/windows/options/OptionButtonRow.gd
diff --git a/game/ui/options/OptionButtonRow.tscn b/game/ui/windows/options/OptionButtonRow.tscn
similarity index 85%
rename from game/ui/options/OptionButtonRow.tscn
rename to game/ui/windows/options/OptionButtonRow.tscn
index c86e5323..061c2e05 100644
--- a/game/ui/options/OptionButtonRow.tscn
+++ b/game/ui/windows/options/OptionButtonRow.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/options/OptionButtonRow.gd" type="Script" id=1]
+[ext_resource path="res://ui/windows/options/OptionButtonRow.gd" type="Script" id=1]
 
 [node name="OptionButtonRow" type="HBoxContainer"]
 margin_right = 527.0
diff --git a/game/ui/options/OptionCheckBox.gd b/game/ui/windows/options/OptionCheckBox.gd
similarity index 100%
rename from game/ui/options/OptionCheckBox.gd
rename to game/ui/windows/options/OptionCheckBox.gd
diff --git a/game/ui/options/OptionCheckboxRow.tscn b/game/ui/windows/options/OptionCheckboxRow.tscn
similarity index 86%
rename from game/ui/options/OptionCheckboxRow.tscn
rename to game/ui/windows/options/OptionCheckboxRow.tscn
index 92ab19a3..b694c9a5 100644
--- a/game/ui/options/OptionCheckboxRow.tscn
+++ b/game/ui/windows/options/OptionCheckboxRow.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/options/OptionToggleRow.gd" type="Script" id=1]
+[ext_resource path="res://ui/windows/options/OptionToggleRow.gd" type="Script" id=1]
 
 [node name="OptionToggleRow" type="HBoxContainer"]
 margin_top = 34.0
diff --git a/game/ui/options/OptionEnumRow.gd b/game/ui/windows/options/OptionEnumRow.gd
similarity index 100%
rename from game/ui/options/OptionEnumRow.gd
rename to game/ui/windows/options/OptionEnumRow.gd
diff --git a/game/ui/options/OptionEnumRow.tscn b/game/ui/windows/options/OptionEnumRow.tscn
similarity index 86%
rename from game/ui/options/OptionEnumRow.tscn
rename to game/ui/windows/options/OptionEnumRow.tscn
index 6f900d97..81a9938f 100644
--- a/game/ui/options/OptionEnumRow.tscn
+++ b/game/ui/windows/options/OptionEnumRow.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/options/OptionEnumRow.gd" type="Script" id=1]
+[ext_resource path="res://ui/windows/options/OptionEnumRow.gd" type="Script" id=1]
 
 [node name="OptionEnumRow" type="HBoxContainer"]
 margin_top = 34.0
diff --git a/game/ui/options/OptionToggleRow.gd b/game/ui/windows/options/OptionToggleRow.gd
similarity index 100%
rename from game/ui/options/OptionToggleRow.gd
rename to game/ui/windows/options/OptionToggleRow.gd
diff --git a/game/ui/options/Options.tscn b/game/ui/windows/options/Options.tscn
similarity index 82%
rename from game/ui/options/Options.tscn
rename to game/ui/windows/options/Options.tscn
index e68c38c8..2016fda2 100644
--- a/game/ui/options/Options.tscn
+++ b/game/ui/windows/options/Options.tscn
@@ -1,14 +1,14 @@
 [gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/player/player_ui/RemoveProfile.gd" type="Script" id=2]
-[ext_resource path="res://ui/options/OptionsViewportLabel.tscn" type="PackedScene" id=3]
-[ext_resource path="res://ui/options/OptionCheckboxRow.tscn" type="PackedScene" id=4]
-[ext_resource path="res://ui/options/OptionCheckBox.gd" type="Script" id=5]
-[ext_resource path="res://ui/options/OptionEnumRow.tscn" type="PackedScene" id=6]
+[ext_resource path="res://ui/windows/options/OptionEnumRow.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/windows/options/OptionCheckboxRow.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/player_ui/RemoveProfile.gd" type="Script" id=4]
+[ext_resource path="res://ui/windows/options/OptionsViewportLabel.tscn" type="PackedScene" id=5]
+[ext_resource path="res://ui/windows/options/OptionCheckBox.gd" type="Script" id=6]
 [ext_resource path="res://ui/scripts/Window.gd" type="Script" id=7]
-[ext_resource path="res://ui/options/OptionsSpinboxRow.tscn" type="PackedScene" id=8]
-[ext_resource path="res://ui/scripts/KeyboardTabContainer.gd" type="Script" id=9]
+[ext_resource path="res://ui/scripts/KeyboardTabContainer.gd" type="Script" id=8]
+[ext_resource path="res://ui/windows/options/OptionsSpinboxRow.tscn" type="PackedScene" id=9]
 
 [node name="Options" type="Control"]
 anchor_right = 1.0
@@ -46,7 +46,7 @@ margin_bottom = 431.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
 tab_align = 0
-script = ExtResource( 9 )
+script = ExtResource( 8 )
 focus_control_on_tab_change_path = NodePath("../Close")
 
 [node name="Video" type="VBoxContainer" parent="PanelContainer/VBoxContainer/TabContainer"]
@@ -58,17 +58,17 @@ margin_right = -4.0
 margin_bottom = -4.0
 size_flags_horizontal = 3
 
-[node name="ViewportWidth" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 3 )]
+[node name="ViewportWidth" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 5 )]
 margin_bottom = 15.0
 property_label = "Viewport Width"
 
-[node name="ViewportHeight" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 3 )]
+[node name="ViewportHeight" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 5 )]
 margin_top = 23.0
 margin_bottom = 38.0
 property_label = "Viewport Height"
 width = false
 
-[node name="ViewportScale" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 8 )]
+[node name="ViewportScale" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 9 )]
 margin_top = 46.0
 margin_bottom = 70.0
 property_category = "rendering"
@@ -78,28 +78,28 @@ min_value = 20.0
 step = 5.0
 suffix = "%"
 
-[node name="Borderless" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 4 )]
+[node name="Borderless" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 3 )]
 margin_top = 78.0
 margin_bottom = 104.0
 property_category = "rendering"
 property_name = "borderless"
 property_label = "Borderless Window"
 
-[node name="FullScreen" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 4 )]
+[node name="FullScreen" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 3 )]
 margin_top = 112.0
 margin_bottom = 138.0
 property_category = "rendering"
 property_name = "fullscreen"
 property_label = "Fullscreen"
 
-[node name="AlwaysOnTop" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 4 )]
+[node name="AlwaysOnTop" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 3 )]
 margin_top = 146.0
 margin_bottom = 172.0
 property_category = "rendering"
 property_name = "always_on_top"
 property_label = "Always On Top"
 
-[node name="ThreadModel" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 6 )]
+[node name="ThreadModel" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 2 )]
 margin_top = 180.0
 margin_bottom = 206.0
 property_category = "rendering"
@@ -107,21 +107,21 @@ property_name = "thread_model"
 property_label = "Thread Model"
 options = [ "Single-Unsafe", "Single-Safe", "Multi Threaded" ]
 
-[node name="Shadows" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 4 )]
+[node name="Shadows" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 3 )]
 margin_top = 214.0
 margin_bottom = 240.0
 property_category = "rendering"
 property_name = "shadows_enabled"
 property_label = "Shadows Enabled"
 
-[node name="VSync" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 4 )]
+[node name="VSync" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 3 )]
 margin_top = 248.0
 margin_bottom = 274.0
 property_category = "rendering"
 property_name = "use_vsync"
 property_label = "VSync"
 
-[node name="VSyncViaCompositor" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 4 )]
+[node name="VSyncViaCompositor" parent="PanelContainer/VBoxContainer/TabContainer/Video" instance=ExtResource( 3 )]
 margin_top = 282.0
 margin_bottom = 308.0
 property_category = "rendering"
@@ -138,7 +138,7 @@ margin_right = -4.0
 margin_bottom = -4.0
 size_flags_horizontal = 3
 
-[node name="OptionsSpinboxRow" parent="PanelContainer/VBoxContainer/TabContainer/Game" instance=ExtResource( 8 )]
+[node name="OptionsSpinboxRow" parent="PanelContainer/VBoxContainer/TabContainer/Game" instance=ExtResource( 9 )]
 margin_top = 0.0
 margin_bottom = 24.0
 property_category = "game"
@@ -148,7 +148,7 @@ min_value = 2.0
 max_value = 30.0
 step = 1.0
 
-[node name="OptionsSpinboxRow2" parent="PanelContainer/VBoxContainer/TabContainer/Game" instance=ExtResource( 8 )]
+[node name="OptionsSpinboxRow2" parent="PanelContainer/VBoxContainer/TabContainer/Game" instance=ExtResource( 9 )]
 margin_top = 32.0
 margin_bottom = 56.0
 property_category = "game"
@@ -157,7 +157,7 @@ property_label = "Chunk Lod First Falloff"
 max_value = 30.0
 step = 1.0
 
-[node name="OptionsSpinboxRow3" parent="PanelContainer/VBoxContainer/TabContainer/Game" instance=ExtResource( 8 )]
+[node name="OptionsSpinboxRow3" parent="PanelContainer/VBoxContainer/TabContainer/Game" instance=ExtResource( 9 )]
 margin_top = 64.0
 margin_bottom = 88.0
 property_category = "game"
@@ -176,14 +176,14 @@ margin_right = -4.0
 margin_bottom = -4.0
 size_flags_horizontal = 3
 
-[node name="OptionToggleRow" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 4 )]
+[node name="OptionToggleRow" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 3 )]
 margin_top = 0.0
 margin_bottom = 26.0
 property_category = "ui"
 property_name = "touchscreen_mode"
 property_label = "Touchscreen Mode"
 
-[node name="OptionsSpinboxRow" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 8 )]
+[node name="OptionsSpinboxRow" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 9 )]
 margin_top = 34.0
 margin_bottom = 58.0
 property_category = "ui"
@@ -194,7 +194,7 @@ max_value = 2.4
 step = 0.01
 rounded = false
 
-[node name="OptionsSpinboxRow2" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 8 )]
+[node name="OptionsSpinboxRow2" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 9 )]
 margin_top = 66.0
 margin_bottom = 90.0
 property_category = "ui"
@@ -205,14 +205,14 @@ max_value = 2.4
 step = 0.01
 rounded = false
 
-[node name="OptionToggleRow2" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 4 )]
+[node name="OptionToggleRow2" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 3 )]
 margin_top = 98.0
 margin_bottom = 124.0
 property_category = "ui"
 property_name = "actionbar_show_keybind_text"
 property_label = "Show Keybind Text"
 
-[node name="OptionToggleRow3" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 4 )]
+[node name="OptionToggleRow3" parent="PanelContainer/VBoxContainer/TabContainer/Interface" instance=ExtResource( 3 )]
 margin_top = 132.0
 margin_bottom = 158.0
 property_category = "ui"
@@ -233,7 +233,7 @@ size_flags_horizontal = 3
 margin_right = 527.0
 margin_bottom = 26.269
 text = "Show Debug info"
-script = ExtResource( 5 )
+script = ExtResource( 6 )
 property_category = "debug"
 property_name = "debug_info"
 
@@ -243,7 +243,7 @@ margin_right = 527.0
 margin_bottom = 60.269
 size_flags_horizontal = 3
 text = "Remove Profile"
-script = ExtResource( 2 )
+script = ExtResource( 4 )
 
 [node name="Close" type="Button" parent="PanelContainer/VBoxContainer"]
 margin_top = 439.0
diff --git a/game/ui/options/OptionsSliderRow.gd b/game/ui/windows/options/OptionsSliderRow.gd
similarity index 100%
rename from game/ui/options/OptionsSliderRow.gd
rename to game/ui/windows/options/OptionsSliderRow.gd
diff --git a/game/ui/options/OptionsSliderRow.tscn b/game/ui/windows/options/OptionsSliderRow.tscn
similarity index 86%
rename from game/ui/options/OptionsSliderRow.tscn
rename to game/ui/windows/options/OptionsSliderRow.tscn
index 70171785..f9ac8e3a 100644
--- a/game/ui/options/OptionsSliderRow.tscn
+++ b/game/ui/windows/options/OptionsSliderRow.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/options/OptionsSliderRow.gd" type="Script" id=1]
+[ext_resource path="res://ui/windows/options/OptionsSliderRow.gd" type="Script" id=1]
 
 [node name="OptionsSliderRow" type="HBoxContainer"]
 margin_top = 46.0
diff --git a/game/ui/options/OptionsSpinboxRow.gd b/game/ui/windows/options/OptionsSpinboxRow.gd
similarity index 100%
rename from game/ui/options/OptionsSpinboxRow.gd
rename to game/ui/windows/options/OptionsSpinboxRow.gd
diff --git a/game/ui/options/OptionsSpinboxRow.tscn b/game/ui/windows/options/OptionsSpinboxRow.tscn
similarity index 89%
rename from game/ui/options/OptionsSpinboxRow.tscn
rename to game/ui/windows/options/OptionsSpinboxRow.tscn
index dbe44e52..d6914b50 100644
--- a/game/ui/options/OptionsSpinboxRow.tscn
+++ b/game/ui/windows/options/OptionsSpinboxRow.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/options/OptionsSpinboxRow.gd" type="Script" id=1]
+[ext_resource path="res://ui/windows/options/OptionsSpinboxRow.gd" type="Script" id=1]
 
 [node name="OptionsSpinboxRow" type="HBoxContainer"]
 margin_top = 70.0
diff --git a/game/ui/options/OptionsViewportLabel.gd b/game/ui/windows/options/OptionsViewportLabel.gd
similarity index 100%
rename from game/ui/options/OptionsViewportLabel.gd
rename to game/ui/windows/options/OptionsViewportLabel.gd
diff --git a/game/ui/options/OptionsViewportLabel.tscn b/game/ui/windows/options/OptionsViewportLabel.tscn
similarity index 85%
rename from game/ui/options/OptionsViewportLabel.tscn
rename to game/ui/windows/options/OptionsViewportLabel.tscn
index f4cd861b..5c2313fd 100644
--- a/game/ui/options/OptionsViewportLabel.tscn
+++ b/game/ui/windows/options/OptionsViewportLabel.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/options/OptionsViewportLabel.gd" type="Script" id=1]
+[ext_resource path="res://ui/windows/options/OptionsViewportLabel.gd" type="Script" id=1]
 
 [node name="OptionsViewportLabel" type="HBoxContainer"]
 margin_right = 527.0
diff --git a/game/ui/options/Threads.gd b/game/ui/windows/options/Threads.gd
similarity index 100%
rename from game/ui/options/Threads.gd
rename to game/ui/windows/options/Threads.gd