diff --git a/game/menu/Menu.tscn b/game/menu/Menu.tscn
index df2d3046..822f6230 100644
--- a/game/menu/Menu.tscn
+++ b/game/menu/Menu.tscn
@@ -1,12 +1,12 @@
 [gd_scene load_steps=36 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/menu/CharacterEntry.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/menu/CharacterEntry.tscn" type="PackedScene" id=2]
 [ext_resource path="res://menu/Menu.gd" type="Script" id=3]
-[ext_resource path="res://ui/menu/menu_character_button_group.tres" type="ButtonGroup" id=4]
+[ext_resource path="res://ui/player/menu/menu_character_button_group.tres" type="ButtonGroup" id=4]
 [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/menu/character_creation_button_group.tres" type="ButtonGroup" id=7]
+[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/register/Register.tscn" type="PackedScene" id=9]
 [ext_resource path="res://ui/login/Login.tscn" type="PackedScene" id=10]
diff --git a/game/scripts/game_modules/DataManager.tscn b/game/scripts/game_modules/DataManager.tscn
index bd79578b..6a2af374 100644
--- a/game/scripts/game_modules/DataManager.tscn
+++ b/game/scripts/game_modules/DataManager.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/DataManager.gd" type="Script" id=1]
-[ext_resource path="res://ui/player_ui/player_ui.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/player_ui/player_ui.tscn" type="PackedScene" id=2]
 
 [node name="DataManager" type="Node"]
 script = ExtResource( 1 )
diff --git a/game/ui/options/Options.tscn b/game/ui/options/Options.tscn
index 50cff46c..8863254f 100644
--- a/game/ui/options/Options.tscn
+++ b/game/ui/options/Options.tscn
@@ -1,7 +1,7 @@
 [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_ui/RemoveProfile.gd" type="Script" id=2]
+[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]
diff --git a/game/ui/actionbars/ActionBar.gd b/game/ui/player/actionbars/ActionBar.gd
similarity index 100%
rename from game/ui/actionbars/ActionBar.gd
rename to game/ui/player/actionbars/ActionBar.gd
diff --git a/game/ui/actionbars/ActionBar.tscn b/game/ui/player/actionbars/ActionBar.tscn
similarity index 80%
rename from game/ui/actionbars/ActionBar.tscn
rename to game/ui/player/actionbars/ActionBar.tscn
index 3a2b8da8..22b4f742 100644
--- a/game/ui/actionbars/ActionBar.tscn
+++ b/game/ui/player/actionbars/ActionBar.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/actionbars/ActionBarEntry.tscn" type="PackedScene" id=1]
-[ext_resource path="res://ui/actionbars/ActionBar.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/actionbars/ActionBarEntry.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/player/actionbars/ActionBar.gd" type="Script" id=2]
 
 [node name="ActionBar" type="VBoxContainer"]
 anchor_left = 1.0
diff --git a/game/ui/actionbars/ActionBarEntry.gd b/game/ui/player/actionbars/ActionBarEntry.gd
similarity index 100%
rename from game/ui/actionbars/ActionBarEntry.gd
rename to game/ui/player/actionbars/ActionBarEntry.gd
diff --git a/game/ui/actionbars/ActionBarEntry.tscn b/game/ui/player/actionbars/ActionBarEntry.tscn
similarity index 96%
rename from game/ui/actionbars/ActionBarEntry.tscn
rename to game/ui/player/actionbars/ActionBarEntry.tscn
index 64112e0d..b6c08252 100644
--- a/game/ui/actionbars/ActionBarEntry.tscn
+++ b/game/ui/player/actionbars/ActionBarEntry.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://ui/actionbars/ActionBarEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/actionbars/ActionBarEntry.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/cooldown_progress.png" type="Texture" id=2]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=3]
 [ext_resource path="res://ui/theme/actionbar_dynamicfont.tres" type="DynamicFont" id=5]
diff --git a/game/ui/actionbars/Actionbars.gd b/game/ui/player/actionbars/Actionbars.gd
similarity index 100%
rename from game/ui/actionbars/Actionbars.gd
rename to game/ui/player/actionbars/Actionbars.gd
diff --git a/game/ui/actionbars/Actionbars.tscn b/game/ui/player/actionbars/Actionbars.tscn
similarity index 66%
rename from game/ui/actionbars/Actionbars.tscn
rename to game/ui/player/actionbars/Actionbars.tscn
index af3f2b72..78095e87 100644
--- a/game/ui/actionbars/Actionbars.tscn
+++ b/game/ui/player/actionbars/Actionbars.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/actionbars/Actionbars.gd" type="Script" id=1]
-[ext_resource path="res://ui/actionbars/ActionBar.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/actionbars/Actionbars.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/actionbars/ActionBar.tscn" type="PackedScene" id=2]
 
 [node name="Actionbars" type="HBoxContainer"]
 anchor_right = 1.0
diff --git a/game/ui/actionbars/EditorKeybindSetup.gd b/game/ui/player/actionbars/EditorKeybindSetup.gd
similarity index 100%
rename from game/ui/actionbars/EditorKeybindSetup.gd
rename to game/ui/player/actionbars/EditorKeybindSetup.gd
diff --git a/game/ui/actionbars/game_module.tres b/game/ui/player/actionbars/game_module.tres
similarity index 72%
rename from game/ui/actionbars/game_module.tres
rename to game/ui/player/actionbars/game_module.tres
index a301a861..6cf620a4 100644
--- a/game/ui/actionbars/game_module.tres
+++ b/game/ui/player/actionbars/game_module.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_gui_child_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/actionbars/Actionbars.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/actionbars/Actionbars.tscn" type="PackedScene" id=2]
 
 [resource]
 script = ExtResource( 1 )
diff --git a/game/ui/auraframe/AuraEntry.gd b/game/ui/player/auraframe/AuraEntry.gd
similarity index 100%
rename from game/ui/auraframe/AuraEntry.gd
rename to game/ui/player/auraframe/AuraEntry.gd
diff --git a/game/ui/auraframe/AuraEntry.tscn b/game/ui/player/auraframe/AuraEntry.tscn
similarity index 97%
rename from game/ui/auraframe/AuraEntry.tscn
rename to game/ui/player/auraframe/AuraEntry.tscn
index 71543256..c6659f78 100644
--- a/game/ui/auraframe/AuraEntry.tscn
+++ b/game/ui/player/auraframe/AuraEntry.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/auraframe/AuraEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/auraframe/AuraEntry.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/ui_dynamicfont_small.tres" type="DynamicFont" id=2]
 
 [node name="AuraEntry" type="VBoxContainer"]
diff --git a/game/ui/auraframe/AuraFrame.gd b/game/ui/player/auraframe/AuraFrame.gd
similarity index 100%
rename from game/ui/auraframe/AuraFrame.gd
rename to game/ui/player/auraframe/AuraFrame.gd
diff --git a/game/ui/auraframe/AuraFrame.tscn b/game/ui/player/auraframe/AuraFrame.tscn
similarity index 87%
rename from game/ui/auraframe/AuraFrame.tscn
rename to game/ui/player/auraframe/AuraFrame.tscn
index 023ce011..888023e1 100644
--- a/game/ui/auraframe/AuraFrame.tscn
+++ b/game/ui/player/auraframe/AuraFrame.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/auraframe/AuraFrame.gd" type="Script" id=1]
-[ext_resource path="res://ui/auraframe/AuraEntry.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/auraframe/AuraFrame.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/auraframe/AuraEntry.tscn" type="PackedScene" id=2]
 
 [node name="AuraFrame" type="Control"]
 anchor_right = 1.0
diff --git a/game/ui/unitframes/game_module.tres b/game/ui/player/auraframe/game_module.tres
similarity index 72%
rename from game/ui/unitframes/game_module.tres
rename to game/ui/player/auraframe/game_module.tres
index 8a6ca142..01d05a33 100644
--- a/game/ui/unitframes/game_module.tres
+++ b/game/ui/player/auraframe/game_module.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_gui_child_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/unitframes/Unitframes.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/auraframe/AuraFrame.tscn" type="PackedScene" id=2]
 
 [resource]
 script = ExtResource( 1 )
diff --git a/game/ui/bags/Bag.tscn b/game/ui/player/bags/Bag.tscn
similarity index 96%
rename from game/ui/bags/Bag.tscn
rename to game/ui/player/bags/Bag.tscn
index 08de2b71..16482a1b 100644
--- a/game/ui/bags/Bag.tscn
+++ b/game/ui/player/bags/Bag.tscn
@@ -1,10 +1,10 @@
 [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/bags/InventoryGUI.gd" type="Script" id=2]
-[ext_resource path="res://ui/bags/BagEntry.tscn" type="PackedScene" id=3]
-[ext_resource path="res://ui/bags/EquipmentSlot.tscn" type="PackedScene" id=4]
-[ext_resource path="res://ui/bags/ItemTooltip.tscn" type="PackedScene" id=5]
+[ext_resource path="res://ui/player/bags/InventoryGUI.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/bags/BagEntry.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/bags/EquipmentSlot.tscn" type="PackedScene" id=4]
+[ext_resource path="res://ui/player/bags/ItemTooltip.tscn" type="PackedScene" id=5]
 
 [node name="Inventory" type="Control"]
 anchor_right = 1.0
diff --git a/game/ui/bags/BagEntry.gd b/game/ui/player/bags/BagEntry.gd
similarity index 100%
rename from game/ui/bags/BagEntry.gd
rename to game/ui/player/bags/BagEntry.gd
diff --git a/game/ui/bags/BagEntry.tscn b/game/ui/player/bags/BagEntry.tscn
similarity index 97%
rename from game/ui/bags/BagEntry.tscn
rename to game/ui/player/bags/BagEntry.tscn
index 0ed2a4fa..5c1be3b6 100644
--- a/game/ui/bags/BagEntry.tscn
+++ b/game/ui/player/bags/BagEntry.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://ui/bags/BagEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/bags/BagEntry.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/cooldown_progress.png" type="Texture" id=2]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=3]
 [ext_resource path="res://ui/theme/actionbar_dynamicfont.tres" type="DynamicFont" id=5]
diff --git a/game/ui/bags/BagFrame.gd b/game/ui/player/bags/BagFrame.gd
similarity index 100%
rename from game/ui/bags/BagFrame.gd
rename to game/ui/player/bags/BagFrame.gd
diff --git a/game/ui/bags/BagFrame.tscn b/game/ui/player/bags/BagFrame.tscn
similarity index 88%
rename from game/ui/bags/BagFrame.tscn
rename to game/ui/player/bags/BagFrame.tscn
index 69607ab2..9d6c5c62 100644
--- a/game/ui/bags/BagFrame.tscn
+++ b/game/ui/player/bags/BagFrame.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/bags/Bag.tscn" type="PackedScene" id=1]
-[ext_resource path="res://ui/bags/BagFrame.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/bags/Bag.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/player/bags/BagFrame.gd" type="Script" id=2]
 
 [node name="BagFrame" type="Control"]
 anchor_right = 1.0
diff --git a/game/ui/bags/BaseWindow.tscn b/game/ui/player/bags/BaseWindow.tscn
similarity index 100%
rename from game/ui/bags/BaseWindow.tscn
rename to game/ui/player/bags/BaseWindow.tscn
diff --git a/game/ui/bags/EquipmentSlot.gd b/game/ui/player/bags/EquipmentSlot.gd
similarity index 100%
rename from game/ui/bags/EquipmentSlot.gd
rename to game/ui/player/bags/EquipmentSlot.gd
diff --git a/game/ui/bags/EquipmentSlot.tscn b/game/ui/player/bags/EquipmentSlot.tscn
similarity index 91%
rename from game/ui/bags/EquipmentSlot.tscn
rename to game/ui/player/bags/EquipmentSlot.tscn
index 971fc466..2801c219 100644
--- a/game/ui/bags/EquipmentSlot.tscn
+++ b/game/ui/player/bags/EquipmentSlot.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/bags/EquipmentSlot.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/bags/EquipmentSlot.gd" type="Script" id=1]
 
 [node name="EquipmentSlot" type="Button"]
 margin_left = 84.0
diff --git a/game/ui/bags/InventoryGUI.gd b/game/ui/player/bags/InventoryGUI.gd
similarity index 100%
rename from game/ui/bags/InventoryGUI.gd
rename to game/ui/player/bags/InventoryGUI.gd
diff --git a/game/ui/bags/InventoryWindow.tscn b/game/ui/player/bags/InventoryWindow.tscn
similarity index 96%
rename from game/ui/bags/InventoryWindow.tscn
rename to game/ui/player/bags/InventoryWindow.tscn
index 7b090e45..dc3b4b85 100644
--- a/game/ui/bags/InventoryWindow.tscn
+++ b/game/ui/player/bags/InventoryWindow.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/bags/ItemEntry.tscn" type="PackedScene" id=1]
-[ext_resource path="res://ui/bags/BaseWindow.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/bags/ItemEntry.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/player/bags/BaseWindow.tscn" type="PackedScene" id=2]
 
 
 
diff --git a/game/ui/bags/ItemEntry.tscn b/game/ui/player/bags/ItemEntry.tscn
similarity index 100%
rename from game/ui/bags/ItemEntry.tscn
rename to game/ui/player/bags/ItemEntry.tscn
diff --git a/game/ui/bags/ItemPupop.gd b/game/ui/player/bags/ItemPupop.gd
similarity index 100%
rename from game/ui/bags/ItemPupop.gd
rename to game/ui/player/bags/ItemPupop.gd
diff --git a/game/ui/bags/ItemTooltip.tscn b/game/ui/player/bags/ItemTooltip.tscn
similarity index 96%
rename from game/ui/bags/ItemTooltip.tscn
rename to game/ui/player/bags/ItemTooltip.tscn
index ac37109e..abf9e316 100644
--- a/game/ui/bags/ItemTooltip.tscn
+++ b/game/ui/player/bags/ItemTooltip.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/bags/ItemPupop.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/bags/ItemPupop.gd" type="Script" id=1]
 
 [node name="ItemTooltip" type="PopupPanel"]
 margin_right = 295.0
diff --git a/game/ui/bags/game_module.tres b/game/ui/player/bags/game_module.tres
similarity index 82%
rename from game/ui/bags/game_module.tres
rename to game/ui/player/bags/game_module.tres
index 3c5777c3..6f64aeca 100644
--- a/game/ui/bags/game_module.tres
+++ b/game/ui/player/bags/game_module.tres
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://ui/theme/bag_icon.tres" type="Texture" id=1]
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=2]
-[ext_resource path="res://ui/bags/Bag.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/bags/Bag.tscn" type="PackedScene" id=3]
 
 [resource]
 script = ExtResource( 2 )
diff --git a/game/ui/bags/weapon_set_button_group.tres b/game/ui/player/bags/weapon_set_button_group.tres
similarity index 100%
rename from game/ui/bags/weapon_set_button_group.tres
rename to game/ui/player/bags/weapon_set_button_group.tres
diff --git a/game/ui/castbar/Castbar.gd b/game/ui/player/castbar/Castbar.gd
similarity index 100%
rename from game/ui/castbar/Castbar.gd
rename to game/ui/player/castbar/Castbar.gd
diff --git a/game/ui/castbar/Castbar.tscn b/game/ui/player/castbar/Castbar.tscn
similarity index 94%
rename from game/ui/castbar/Castbar.tscn
rename to game/ui/player/castbar/Castbar.tscn
index d5bf1f4e..2de2a169 100644
--- a/game/ui/castbar/Castbar.tscn
+++ b/game/ui/player/castbar/Castbar.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/castbar/Castbar.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/castbar/Castbar.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/scrollbar_grabber_blue.tres" type="StyleBox" id=2]
 
 [node name="Castbar" type="VBoxContainer"]
diff --git a/game/ui/castbar/game_module.tres b/game/ui/player/castbar/game_module.tres
similarity index 73%
rename from game/ui/castbar/game_module.tres
rename to game/ui/player/castbar/game_module.tres
index 2d4c9e7e..96845057 100644
--- a/game/ui/castbar/game_module.tres
+++ b/game/ui/player/castbar/game_module.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_gui_child_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/castbar/Castbar.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/castbar/Castbar.tscn" type="PackedScene" id=2]
 
 [resource]
 script = ExtResource( 1 )
diff --git a/game/ui/character/CharacterWindow.gd b/game/ui/player/character/CharacterWindow.gd
similarity index 100%
rename from game/ui/character/CharacterWindow.gd
rename to game/ui/player/character/CharacterWindow.gd
diff --git a/game/ui/character/CharacterWindow.tscn b/game/ui/player/character/CharacterWindow.tscn
similarity index 98%
rename from game/ui/character/CharacterWindow.tscn
rename to game/ui/player/character/CharacterWindow.tscn
index 25abd6dd..58601efb 100644
--- a/game/ui/character/CharacterWindow.tscn
+++ b/game/ui/player/character/CharacterWindow.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/character/CharacterWindow.gd" type="Script" id=2]
-[ext_resource path="res://ui/character/SingleStatRow.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/character/CharacterWindow.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/character/SingleStatRow.tscn" type="PackedScene" id=3]
 
 [node name="CharacterWindow" type="Control"]
 anchor_right = 1.0
diff --git a/game/ui/character/SingleStatRow.gd b/game/ui/player/character/SingleStatRow.gd
similarity index 100%
rename from game/ui/character/SingleStatRow.gd
rename to game/ui/player/character/SingleStatRow.gd
diff --git a/game/ui/character/SingleStatRow.tscn b/game/ui/player/character/SingleStatRow.tscn
similarity index 86%
rename from game/ui/character/SingleStatRow.tscn
rename to game/ui/player/character/SingleStatRow.tscn
index af3ffed3..96842769 100644
--- a/game/ui/character/SingleStatRow.tscn
+++ b/game/ui/player/character/SingleStatRow.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/character/SingleStatRow.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/character/SingleStatRow.gd" type="Script" id=1]
 
 [node name="SingleStatRow" type="HBoxContainer"]
 margin_right = 1016.0
diff --git a/game/ui/character/game_module.tres b/game/ui/player/character/game_module.tres
similarity index 79%
rename from game/ui/character/game_module.tres
rename to game/ui/player/character/game_module.tres
index 3efffa83..c8134baf 100644
--- a/game/ui/character/game_module.tres
+++ b/game/ui/player/character/game_module.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=4 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/character/CharacterWindow.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/character/CharacterWindow.tscn" type="PackedScene" id=2]
 [ext_resource path="res://ui/theme/character_icon.tres" type="Texture" id=3]
 
 [resource]
diff --git a/game/ui/crafting/CraftItemDescription.gd b/game/ui/player/crafting/CraftItemDescription.gd
similarity index 100%
rename from game/ui/crafting/CraftItemDescription.gd
rename to game/ui/player/crafting/CraftItemDescription.gd
diff --git a/game/ui/crafting/CraftingWindow.gd b/game/ui/player/crafting/CraftingWindow.gd
similarity index 100%
rename from game/ui/crafting/CraftingWindow.gd
rename to game/ui/player/crafting/CraftingWindow.gd
diff --git a/game/ui/crafting/CraftingWindow.tscn b/game/ui/player/crafting/CraftingWindow.tscn
similarity index 97%
rename from game/ui/crafting/CraftingWindow.tscn
rename to game/ui/player/crafting/CraftingWindow.tscn
index e8d411b9..c6f9e77e 100644
--- a/game/ui/crafting/CraftingWindow.tscn
+++ b/game/ui/player/crafting/CraftingWindow.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/crafting/CraftingWindow.gd" type="Script" id=2]
-[ext_resource path="res://ui/crafting/RecipeSelector.tscn" type="PackedScene" id=3]
-[ext_resource path="res://ui/crafting/ItemEntry.tscn" type="PackedScene" id=4]
-[ext_resource path="res://ui/crafting/CraftItemDescription.gd" type="Script" id=5]
+[ext_resource path="res://ui/player/crafting/CraftingWindow.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/crafting/RecipeSelector.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/crafting/ItemEntry.tscn" type="PackedScene" id=4]
+[ext_resource path="res://ui/player/crafting/CraftItemDescription.gd" type="Script" id=5]
 
 [sub_resource type="ButtonGroup" id=1]
 
diff --git a/game/ui/crafting/ItemEntry.gd b/game/ui/player/crafting/ItemEntry.gd
similarity index 100%
rename from game/ui/crafting/ItemEntry.gd
rename to game/ui/player/crafting/ItemEntry.gd
diff --git a/game/ui/crafting/ItemEntry.tscn b/game/ui/player/crafting/ItemEntry.tscn
similarity index 93%
rename from game/ui/crafting/ItemEntry.tscn
rename to game/ui/player/crafting/ItemEntry.tscn
index 3b9026da..424f13c3 100644
--- a/game/ui/crafting/ItemEntry.tscn
+++ b/game/ui/player/crafting/ItemEntry.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/crafting/ItemEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/crafting/ItemEntry.gd" type="Script" id=1]
 
 [node name="ItemEntry" type="PanelContainer"]
 margin_right = 695.0
diff --git a/game/ui/crafting/RecipeSelector.gd b/game/ui/player/crafting/RecipeSelector.gd
similarity index 100%
rename from game/ui/crafting/RecipeSelector.gd
rename to game/ui/player/crafting/RecipeSelector.gd
diff --git a/game/ui/crafting/RecipeSelector.tscn b/game/ui/player/crafting/RecipeSelector.tscn
similarity index 72%
rename from game/ui/crafting/RecipeSelector.tscn
rename to game/ui/player/crafting/RecipeSelector.tscn
index 575485ac..bb6cda93 100644
--- a/game/ui/crafting/RecipeSelector.tscn
+++ b/game/ui/player/crafting/RecipeSelector.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/crafting/RecipeSelector.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/crafting/RecipeSelector.gd" type="Script" id=1]
 
 [node name="RecipeSelector" type="Button"]
 margin_right = 303.0
diff --git a/game/ui/crafting/game_module.tres b/game/ui/player/crafting/game_module.tres
similarity index 80%
rename from game/ui/crafting/game_module.tres
rename to game/ui/player/crafting/game_module.tres
index 71af8a5e..b050ee54 100644
--- a/game/ui/crafting/game_module.tres
+++ b/game/ui/player/crafting/game_module.tres
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://ui/theme/crafting_icon.tres" type="Texture" id=1]
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=2]
-[ext_resource path="res://ui/crafting/CraftingWindow.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/crafting/CraftingWindow.tscn" type="PackedScene" id=3]
 
 [resource]
 script = ExtResource( 2 )
diff --git a/game/ui/errorframe/ErrorFrame.tscn b/game/ui/player/errorframe/ErrorFrame.tscn
similarity index 100%
rename from game/ui/errorframe/ErrorFrame.tscn
rename to game/ui/player/errorframe/ErrorFrame.tscn
diff --git a/game/ui/loot_window/LootEntry.gd b/game/ui/player/loot_window/LootEntry.gd
similarity index 100%
rename from game/ui/loot_window/LootEntry.gd
rename to game/ui/player/loot_window/LootEntry.gd
diff --git a/game/ui/loot_window/LootEntry.tscn b/game/ui/player/loot_window/LootEntry.tscn
similarity index 94%
rename from game/ui/loot_window/LootEntry.tscn
rename to game/ui/player/loot_window/LootEntry.tscn
index cd3a857e..9a08c779 100644
--- a/game/ui/loot_window/LootEntry.tscn
+++ b/game/ui/player/loot_window/LootEntry.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/loot_window/LootEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/loot_window/LootEntry.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=2]
 
 [node name="lootEntry" type="PanelContainer"]
diff --git a/game/ui/loot_window/LootWindow.gd b/game/ui/player/loot_window/LootWindow.gd
similarity index 100%
rename from game/ui/loot_window/LootWindow.gd
rename to game/ui/player/loot_window/LootWindow.gd
diff --git a/game/ui/loot_window/LootWindow.tscn b/game/ui/player/loot_window/LootWindow.tscn
similarity index 89%
rename from game/ui/loot_window/LootWindow.tscn
rename to game/ui/player/loot_window/LootWindow.tscn
index 18807e4a..7a410a11 100644
--- a/game/ui/loot_window/LootWindow.tscn
+++ b/game/ui/player/loot_window/LootWindow.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://ui/loot_window/LootWindow.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/loot_window/LootWindow.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=2]
-[ext_resource path="res://ui/loot_window/LootEntry.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/loot_window/LootEntry.tscn" type="PackedScene" id=3]
 
 [node name="LootWindow" type="Control"]
 anchor_right = 1.0
diff --git a/game/ui/loot_window/game_module.tres b/game/ui/player/loot_window/game_module.tres
similarity index 73%
rename from game/ui/loot_window/game_module.tres
rename to game/ui/player/loot_window/game_module.tres
index 8a640a31..0310eb0a 100644
--- a/game/ui/loot_window/game_module.tres
+++ b/game/ui/player/loot_window/game_module.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=2]
-[ext_resource path="res://ui/loot_window/LootWindow.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/loot_window/LootWindow.tscn" type="PackedScene" id=3]
 
 [resource]
 script = ExtResource( 2 )
diff --git a/game/ui/map/Map.tscn b/game/ui/player/map/Map.tscn
similarity index 100%
rename from game/ui/map/Map.tscn
rename to game/ui/player/map/Map.tscn
diff --git a/game/ui/menu/CharacterEntry.gd b/game/ui/player/menu/CharacterEntry.gd
similarity index 100%
rename from game/ui/menu/CharacterEntry.gd
rename to game/ui/player/menu/CharacterEntry.gd
diff --git a/game/ui/menu/CharacterEntry.tscn b/game/ui/player/menu/CharacterEntry.tscn
similarity index 97%
rename from game/ui/menu/CharacterEntry.tscn
rename to game/ui/player/menu/CharacterEntry.tscn
index bcaeaa77..bc9c79a6 100644
--- a/game/ui/menu/CharacterEntry.tscn
+++ b/game/ui/player/menu/CharacterEntry.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/menu/CharacterEntry.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/menu/CharacterEntry.gd" type="Script" id=2]
 
 [node name="CharacterEntry" type="Button"]
 margin_right = 224.0
diff --git a/game/ui/menu/character_creation_button_group.tres b/game/ui/player/menu/character_creation_button_group.tres
similarity index 100%
rename from game/ui/menu/character_creation_button_group.tres
rename to game/ui/player/menu/character_creation_button_group.tres
diff --git a/game/ui/menu/menu_character_button_group.tres b/game/ui/player/menu/menu_character_button_group.tres
similarity index 100%
rename from game/ui/menu/menu_character_button_group.tres
rename to game/ui/player/menu/menu_character_button_group.tres
diff --git a/game/ui/minimap/MiniMap.tscn b/game/ui/player/minimap/MiniMap.tscn
similarity index 100%
rename from game/ui/minimap/MiniMap.tscn
rename to game/ui/player/minimap/MiniMap.tscn
diff --git a/game/ui/player_ui/RemoveProfile.gd b/game/ui/player/player_ui/RemoveProfile.gd
similarity index 100%
rename from game/ui/player_ui/RemoveProfile.gd
rename to game/ui/player/player_ui/RemoveProfile.gd
diff --git a/game/ui/player_ui/player_ui.gd b/game/ui/player/player_ui/player_ui.gd
similarity index 100%
rename from game/ui/player_ui/player_ui.gd
rename to game/ui/player/player_ui/player_ui.gd
diff --git a/game/ui/player_ui/player_ui.tscn b/game/ui/player/player_ui/player_ui.tscn
similarity index 81%
rename from game/ui/player_ui/player_ui.tscn
rename to game/ui/player/player_ui/player_ui.tscn
index 37849d73..e4af0bd4 100644
--- a/game/ui/player_ui/player_ui.tscn
+++ b/game/ui/player/player_ui/player_ui.tscn
@@ -1,17 +1,17 @@
 [gd_scene load_steps=10 format=2]
 
-[ext_resource path="res://player/GUI.gd" type="Script" id=1]
-[ext_resource path="res://ui/ingame_menu/IngameMenu.tscn" type="PackedScene" id=2]
-[ext_resource path="res://ui/theme/menu_icon.tres" type="Texture" id=6]
-[ext_resource path="res://ui/buttons/Buttons.gd" type="Script" id=9]
-[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=10]
-[ext_resource path="res://ui/theme/locked_icon.tres" type="Texture" id=25]
-[ext_resource path="res://ui/theme/unlocked_icon.tres" type="Texture" id=26]
-[ext_resource path="res://ui/player_ui/player_ui.gd" type="Script" id=28]
-[ext_resource path="res://ui/buttons/ImageButton.tscn" type="PackedScene" id=30]
+[ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
+[ext_resource path="res://ui/theme/locked_icon.tres" type="Texture" id=2]
+[ext_resource path="res://ui/theme/menu_icon.tres" type="Texture" id=3]
+[ext_resource path="res://ui/theme/unlocked_icon.tres" type="Texture" id=4]
+[ext_resource path="res://player/GUI.gd" type="Script" id=5]
+[ext_resource path="res://ui/player/player_ui/player_ui.gd" type="Script" id=6]
+[ext_resource path="res://ui/ingame_menu/IngameMenu.tscn" type="PackedScene" id=7]
+[ext_resource path="res://ui/buttons/Buttons.gd" type="Script" id=8]
+[ext_resource path="res://ui/buttons/ImageButton.tscn" type="PackedScene" id=9]
 
 [node name="GUILayer" type="CanvasLayer"]
-script = ExtResource( 28 )
+script = ExtResource( 6 )
 gui_base_path = NodePath("GUI")
 buttons_path = NodePath("GUI/Buttons")
 windows_path = NodePath("GUI/Windows")
@@ -20,8 +20,8 @@ windows_path = NodePath("GUI/Windows")
 anchor_right = 1.0
 anchor_bottom = 1.0
 mouse_filter = 2
-theme = ExtResource( 10 )
-script = ExtResource( 1 )
+theme = ExtResource( 1 )
+script = ExtResource( 5 )
 __meta__ = {
 "_edit_lock_": true
 }
@@ -34,12 +34,12 @@ margin_right = 342.0
 rect_min_size = Vector2( 0, 40 )
 mouse_filter = 2
 custom_constants/separation = 0
-script = ExtResource( 9 )
+script = ExtResource( 8 )
 __meta__ = {
 "_edit_group_": true,
 "_edit_use_anchors_": false
 }
-image_button = ExtResource( 30 )
+image_button = ExtResource( 9 )
 lock_button_path = NodePath("LockButton")
 
 [node name="LockButton" type="Button" parent="GUI/Buttons"]
@@ -52,7 +52,7 @@ keep_pressed_outside = true
 [node name="locked" type="TextureRect" parent="GUI/Buttons/LockButton"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-texture = ExtResource( 25 )
+texture = ExtResource( 2 )
 expand = true
 stretch_mode = 6
 __meta__ = {
@@ -63,7 +63,7 @@ __meta__ = {
 visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
-texture = ExtResource( 26 )
+texture = ExtResource( 4 )
 expand = true
 stretch_mode = 6
 __meta__ = {
@@ -80,7 +80,7 @@ keep_pressed_outside = true
 [node name="TextureRect3" type="TextureRect" parent="GUI/Buttons/Menu"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-texture = ExtResource( 6 )
+texture = ExtResource( 3 )
 expand = true
 stretch_mode = 6
 __meta__ = {
@@ -90,7 +90,7 @@ __meta__ = {
 [node name="Windows" type="CanvasLayer" parent="GUI"]
 layer = 2
 
-[node name="IngameMenu" parent="GUI" instance=ExtResource( 2 )]
+[node name="IngameMenu" parent="GUI" instance=ExtResource( 7 )]
 visible = false
 
 [connection signal="pressed" from="GUI/Buttons/Menu" to="GUI/IngameMenu" method="show"]
diff --git a/game/ui/spellbook/SpellBookWindow.gd b/game/ui/player/spellbook/SpellBookWindow.gd
similarity index 100%
rename from game/ui/spellbook/SpellBookWindow.gd
rename to game/ui/player/spellbook/SpellBookWindow.gd
diff --git a/game/ui/spellbook/SpellBookWindow.tscn b/game/ui/player/spellbook/SpellBookWindow.tscn
similarity index 96%
rename from game/ui/spellbook/SpellBookWindow.tscn
rename to game/ui/player/spellbook/SpellBookWindow.tscn
index 2f081fb3..9279e0fd 100644
--- a/game/ui/spellbook/SpellBookWindow.tscn
+++ b/game/ui/player/spellbook/SpellBookWindow.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/spellbook/SpellBookWindow.gd" type="Script" id=2]
-[ext_resource path="res://ui/spellbook/SpellContainer.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/spellbook/SpellBookWindow.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/spellbook/SpellContainer.tscn" type="PackedScene" id=3]
 
 [node name="SpellBookWindow" type="Control"]
 anchor_right = 1.0
diff --git a/game/ui/spellbook/SpellContainer.gd b/game/ui/player/spellbook/SpellContainer.gd
similarity index 100%
rename from game/ui/spellbook/SpellContainer.gd
rename to game/ui/player/spellbook/SpellContainer.gd
diff --git a/game/ui/spellbook/SpellContainer.tscn b/game/ui/player/spellbook/SpellContainer.tscn
similarity index 94%
rename from game/ui/spellbook/SpellContainer.tscn
rename to game/ui/player/spellbook/SpellContainer.tscn
index 3dda6b01..5fddbd3c 100644
--- a/game/ui/spellbook/SpellContainer.tscn
+++ b/game/ui/player/spellbook/SpellContainer.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/spellbook/SpellDragAndDropSpellBook.gd" type="Script" id=2]
-[ext_resource path="res://ui/spellbook/SpellContainer.gd" type="Script" id=3]
-[ext_resource path="res://ui/spellbook/SpellEntryPopup.gd" type="Script" id=4]
+[ext_resource path="res://ui/player/spellbook/SpellDragAndDropSpellBook.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/spellbook/SpellContainer.gd" type="Script" id=3]
+[ext_resource path="res://ui/player/spellbook/SpellEntryPopup.gd" type="Script" id=4]
 
 [node name="SpellContainer" type="Control"]
 margin_left = 290.0
diff --git a/game/ui/spellbook/SpellDragAndDropSpellBook.gd b/game/ui/player/spellbook/SpellDragAndDropSpellBook.gd
similarity index 100%
rename from game/ui/spellbook/SpellDragAndDropSpellBook.gd
rename to game/ui/player/spellbook/SpellDragAndDropSpellBook.gd
diff --git a/game/ui/spellbook/SpellEntryPopup.gd b/game/ui/player/spellbook/SpellEntryPopup.gd
similarity index 100%
rename from game/ui/spellbook/SpellEntryPopup.gd
rename to game/ui/player/spellbook/SpellEntryPopup.gd
diff --git a/game/ui/spellbook/game_module.tres b/game/ui/player/spellbook/game_module.tres
similarity index 79%
rename from game/ui/spellbook/game_module.tres
rename to game/ui/player/spellbook/game_module.tres
index 9080b7e8..9c22499f 100644
--- a/game/ui/spellbook/game_module.tres
+++ b/game/ui/player/spellbook/game_module.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=4 format=2]
 
 [ext_resource path="res://ui/theme/spellbook_icon.tres" type="Texture" id=1]
-[ext_resource path="res://ui/spellbook/SpellBookWindow.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/spellbook/SpellBookWindow.tscn" type="PackedScene" id=2]
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=3]
 
 [resource]
diff --git a/game/ui/starmap/StarMap.tscn b/game/ui/player/starmap/StarMap.tscn
similarity index 100%
rename from game/ui/starmap/StarMap.tscn
rename to game/ui/player/starmap/StarMap.tscn
diff --git a/game/ui/talents/Spec.gd b/game/ui/player/talents/Spec.gd
similarity index 100%
rename from game/ui/talents/Spec.gd
rename to game/ui/player/talents/Spec.gd
diff --git a/game/ui/talents/Spec.tscn b/game/ui/player/talents/Spec.tscn
similarity index 73%
rename from game/ui/talents/Spec.tscn
rename to game/ui/player/talents/Spec.tscn
index 18b157aa..71f48f79 100644
--- a/game/ui/talents/Spec.tscn
+++ b/game/ui/player/talents/Spec.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/talents/Spec.gd" type="Script" id=1]
-[ext_resource path="res://ui/talents/TalentRow.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/talents/Spec.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/talents/TalentRow.tscn" type="PackedScene" id=2]
 
 [node name="Spec" type="ScrollContainer"]
 margin_right = 882.0
diff --git a/game/ui/talents/TalentEntry.gd b/game/ui/player/talents/TalentEntry.gd
similarity index 100%
rename from game/ui/talents/TalentEntry.gd
rename to game/ui/player/talents/TalentEntry.gd
diff --git a/game/ui/talents/TalentEntry.tscn b/game/ui/player/talents/TalentEntry.tscn
similarity index 97%
rename from game/ui/talents/TalentEntry.tscn
rename to game/ui/player/talents/TalentEntry.tscn
index 78783728..7f83fa69 100644
--- a/game/ui/talents/TalentEntry.tscn
+++ b/game/ui/player/talents/TalentEntry.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/talents/TalentEntry.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/talents/TalentEntry.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=2]
 
 [node name="TalentEntry" type="CenterContainer"]
diff --git a/game/ui/talents/TalentRow.gd b/game/ui/player/talents/TalentRow.gd
similarity index 100%
rename from game/ui/talents/TalentRow.gd
rename to game/ui/player/talents/TalentRow.gd
diff --git a/game/ui/talents/TalentRow.tscn b/game/ui/player/talents/TalentRow.tscn
similarity index 68%
rename from game/ui/talents/TalentRow.tscn
rename to game/ui/player/talents/TalentRow.tscn
index 43768570..17c137a1 100644
--- a/game/ui/talents/TalentRow.tscn
+++ b/game/ui/player/talents/TalentRow.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://ui/talents/TalentEntry.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/player/talents/TalentEntry.tscn" type="PackedScene" id=1]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=2]
-[ext_resource path="res://ui/talents/TalentRow.gd" type="Script" id=3]
+[ext_resource path="res://ui/player/talents/TalentRow.gd" type="Script" id=3]
 
 [node name="TalentRow" type="HBoxContainer"]
 anchor_right = 1.0
diff --git a/game/ui/talents/TalentWindow.gd b/game/ui/player/talents/TalentWindow.gd
similarity index 100%
rename from game/ui/talents/TalentWindow.gd
rename to game/ui/player/talents/TalentWindow.gd
diff --git a/game/ui/talents/TalentWindow.tscn b/game/ui/player/talents/TalentWindow.tscn
similarity index 93%
rename from game/ui/talents/TalentWindow.tscn
rename to game/ui/player/talents/TalentWindow.tscn
index 5af265d7..28b8e0c8 100644
--- a/game/ui/talents/TalentWindow.tscn
+++ b/game/ui/player/talents/TalentWindow.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/talents/Spec.tscn" type="PackedScene" id=2]
-[ext_resource path="res://ui/talents/TalentWindow.gd" type="Script" id=3]
-[ext_resource path="res://ui/talents/talent_switcher_button.tscn" type="PackedScene" id=4]
+[ext_resource path="res://ui/player/talents/Spec.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/talents/TalentWindow.gd" type="Script" id=3]
+[ext_resource path="res://ui/player/talents/talent_switcher_button.tscn" type="PackedScene" id=4]
 
 [node name="TalentWindow" type="Control"]
 anchor_right = 1.0
diff --git a/game/ui/talents/game_module.tres b/game/ui/player/talents/game_module.tres
similarity index 80%
rename from game/ui/talents/game_module.tres
rename to game/ui/player/talents/game_module.tres
index c343d871..e631d547 100644
--- a/game/ui/talents/game_module.tres
+++ b/game/ui/player/talents/game_module.tres
@@ -2,7 +2,7 @@
 
 [ext_resource path="res://ui/theme/talent_icon.tres" type="Texture" id=1]
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=2]
-[ext_resource path="res://ui/talents/TalentWindow.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/talents/TalentWindow.tscn" type="PackedScene" id=3]
 
 [resource]
 script = ExtResource( 2 )
diff --git a/game/ui/talents/talent_switcher_button.gd b/game/ui/player/talents/talent_switcher_button.gd
similarity index 100%
rename from game/ui/talents/talent_switcher_button.gd
rename to game/ui/player/talents/talent_switcher_button.gd
diff --git a/game/ui/talents/talent_switcher_button.tscn b/game/ui/player/talents/talent_switcher_button.tscn
similarity index 73%
rename from game/ui/talents/talent_switcher_button.tscn
rename to game/ui/player/talents/talent_switcher_button.tscn
index 637bbe72..eda6a512 100644
--- a/game/ui/talents/talent_switcher_button.tscn
+++ b/game/ui/player/talents/talent_switcher_button.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://ui/talents/talent_switcher_button.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/talents/talent_switcher_button.gd" type="Script" id=1]
 
 [node name="TalentSwitcher" type="Button"]
 margin_left = 301.0
diff --git a/game/ui/touch_controls/TouchMovementControls.tscn b/game/ui/player/touch_controls/TouchMovementControls.tscn
similarity index 90%
rename from game/ui/touch_controls/TouchMovementControls.tscn
rename to game/ui/player/touch_controls/TouchMovementControls.tscn
index 02293481..9650aadb 100644
--- a/game/ui/touch_controls/TouchMovementControls.tscn
+++ b/game/ui/player/touch_controls/TouchMovementControls.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://ui/touch_pad/TurnPanel.gd" type="Script" id=1]
-[ext_resource path="res://ui/touch_pad/analog.gd" type="Script" id=2]
-[ext_resource path="res://ui/touch_pad/analog.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ui/player/touch_pad/TurnPanel.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/touch_pad/analog.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/touch_pad/analog.tscn" type="PackedScene" id=3]
 
 [node name="TouchMovementControls" type="MarginContainer"]
 anchor_right = 1.0
diff --git a/game/ui/touch_controls/TouchTargetControls.tscn b/game/ui/player/touch_controls/TouchTargetControls.tscn
similarity index 88%
rename from game/ui/touch_controls/TouchTargetControls.tscn
rename to game/ui/player/touch_controls/TouchTargetControls.tscn
index 289c10a6..a3a46a89 100644
--- a/game/ui/touch_controls/TouchTargetControls.tscn
+++ b/game/ui/player/touch_controls/TouchTargetControls.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/touch_pad/analog.gd" type="Script" id=1]
-[ext_resource path="res://ui/touch_pad/analog.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/touch_pad/analog.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/touch_pad/analog.tscn" type="PackedScene" id=2]
 
 [node name="TouchTargetControls" type="MarginContainer"]
 visible = false
diff --git a/game/ui/touch_controls/game_module.tres b/game/ui/player/touch_controls/game_module.tres
similarity index 69%
rename from game/ui/touch_controls/game_module.tres
rename to game/ui/player/touch_controls/game_module.tres
index a7fdfd35..3694994d 100644
--- a/game/ui/touch_controls/game_module.tres
+++ b/game/ui/player/touch_controls/game_module.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_gui_child_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/touch_controls/TouchMovementControls.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/touch_controls/TouchMovementControls.tscn" type="PackedScene" id=2]
 
 [resource]
 script = ExtResource( 1 )
diff --git a/game/ui/touch_pad/TurnPanel.gd b/game/ui/player/touch_pad/TurnPanel.gd
similarity index 100%
rename from game/ui/touch_pad/TurnPanel.gd
rename to game/ui/player/touch_pad/TurnPanel.gd
diff --git a/game/ui/touch_pad/analog.gd b/game/ui/player/touch_pad/analog.gd
similarity index 100%
rename from game/ui/touch_pad/analog.gd
rename to game/ui/player/touch_pad/analog.gd
diff --git a/game/ui/touch_pad/analog.tscn b/game/ui/player/touch_pad/analog.tscn
similarity index 89%
rename from game/ui/touch_pad/analog.tscn
rename to game/ui/player/touch_pad/analog.tscn
index a5187c5c..b0857911 100644
--- a/game/ui/touch_pad/analog.tscn
+++ b/game/ui/player/touch_pad/analog.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=8 format=2]
 
-[ext_resource path="res://ui/touch_pad/analog.gd" type="Script" id=1]
-[ext_resource path="res://ui/touch_pad/big_circle.png" type="Texture" id=2]
-[ext_resource path="res://ui/touch_pad/small_circle.png" type="Texture" id=3]
+[ext_resource path="res://ui/player/touch_pad/analog.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/touch_pad/big_circle.png" type="Texture" id=2]
+[ext_resource path="res://ui/player/touch_pad/small_circle.png" type="Texture" id=3]
 
 [sub_resource type="Animation" id=1]
 length = 5.0
diff --git a/game/ui/touch_pad/analog.xml b/game/ui/player/touch_pad/analog.xml
similarity index 100%
rename from game/ui/touch_pad/analog.xml
rename to game/ui/player/touch_pad/analog.xml
diff --git a/game/ui/touch_pad/big_circle.png b/game/ui/player/touch_pad/big_circle.png
similarity index 100%
rename from game/ui/touch_pad/big_circle.png
rename to game/ui/player/touch_pad/big_circle.png
diff --git a/game/ui/touch_pad/big_circle.png.import b/game/ui/player/touch_pad/big_circle.png.import
similarity index 70%
rename from game/ui/touch_pad/big_circle.png.import
rename to game/ui/player/touch_pad/big_circle.png.import
index 204dd354..b5785123 100644
--- a/game/ui/touch_pad/big_circle.png.import
+++ b/game/ui/player/touch_pad/big_circle.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/big_circle.png-3e7d1c39c6dde9ffecb18aecfb2a2a19.stex"
+path="res://.import/big_circle.png-8b4736f4bd8bcb5851282bd183b16c9d.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://ui/touch_pad/big_circle.png"
-dest_files=[ "res://.import/big_circle.png-3e7d1c39c6dde9ffecb18aecfb2a2a19.stex" ]
+source_file="res://ui/player/touch_pad/big_circle.png"
+dest_files=[ "res://.import/big_circle.png-8b4736f4bd8bcb5851282bd183b16c9d.stex" ]
 
 [params]
 
diff --git a/game/ui/touch_pad/small_circle.png b/game/ui/player/touch_pad/small_circle.png
similarity index 100%
rename from game/ui/touch_pad/small_circle.png
rename to game/ui/player/touch_pad/small_circle.png
diff --git a/game/ui/touch_pad/small_circle.png.import b/game/ui/player/touch_pad/small_circle.png.import
similarity index 69%
rename from game/ui/touch_pad/small_circle.png.import
rename to game/ui/player/touch_pad/small_circle.png.import
index 9d3390f4..06932fcb 100644
--- a/game/ui/touch_pad/small_circle.png.import
+++ b/game/ui/player/touch_pad/small_circle.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/small_circle.png-035ef8e6fee54222401287369836bd6a.stex"
+path="res://.import/small_circle.png-770fa887d3b9728db02e99b9be5c0e0c.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://ui/touch_pad/small_circle.png"
-dest_files=[ "res://.import/small_circle.png-035ef8e6fee54222401287369836bd6a.stex" ]
+source_file="res://ui/player/touch_pad/small_circle.png"
+dest_files=[ "res://.import/small_circle.png-770fa887d3b9728db02e99b9be5c0e0c.stex" ]
 
 [params]
 
diff --git a/game/ui/trainer/TrainerWindow.gd b/game/ui/player/trainer/TrainerWindow.gd
similarity index 100%
rename from game/ui/trainer/TrainerWindow.gd
rename to game/ui/player/trainer/TrainerWindow.gd
diff --git a/game/ui/trainer/TrainerWindow.tscn b/game/ui/player/trainer/TrainerWindow.tscn
similarity index 98%
rename from game/ui/trainer/TrainerWindow.tscn
rename to game/ui/player/trainer/TrainerWindow.tscn
index 6d1c97dd..71c5e73f 100644
--- a/game/ui/trainer/TrainerWindow.tscn
+++ b/game/ui/player/trainer/TrainerWindow.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://ui/trainer/TrainerWindow.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/trainer/TrainerWindow.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=2]
 
 [node name="TrainerWindow" type="Control"]
diff --git a/game/ui/trainer/game_module.tres b/game/ui/player/trainer/game_module.tres
similarity index 73%
rename from game/ui/trainer/game_module.tres
rename to game/ui/player/trainer/game_module.tres
index 816bec24..38be54ef 100644
--- a/game/ui/trainer/game_module.tres
+++ b/game/ui/player/trainer/game_module.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
-[ext_resource path="res://ui/trainer/TrainerWindow.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/player/trainer/TrainerWindow.tscn" type="PackedScene" id=1]
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=2]
 
 [resource]
diff --git a/game/ui/unitframes/TargetUnitframe.gd b/game/ui/player/unitframes/TargetUnitframe.gd
similarity index 100%
rename from game/ui/unitframes/TargetUnitframe.gd
rename to game/ui/player/unitframes/TargetUnitframe.gd
diff --git a/game/ui/unitframes/TargetUnitframe.tscn b/game/ui/player/unitframes/TargetUnitframe.tscn
similarity index 95%
rename from game/ui/unitframes/TargetUnitframe.tscn
rename to game/ui/player/unitframes/TargetUnitframe.tscn
index d7768255..433a62bb 100644
--- a/game/ui/unitframes/TargetUnitframe.tscn
+++ b/game/ui/player/unitframes/TargetUnitframe.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://ui/unitframes/TargetUnitframe.gd" type="Script" id=1]
-[ext_resource path="res://ui/auraframe/AuraEntry.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/unitframes/TargetUnitframe.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/auraframe/AuraEntry.tscn" type="PackedScene" id=2]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=3]
 [ext_resource path="res://ui/theme/scrollbar_grabber_red.tres" type="StyleBox" id=4]
 [ext_resource path="res://ui/theme/scrollbar_grabber_blue.tres" type="StyleBox" id=5]
diff --git a/game/ui/unitframes/UnitframeBase.gd b/game/ui/player/unitframes/UnitframeBase.gd
similarity index 100%
rename from game/ui/unitframes/UnitframeBase.gd
rename to game/ui/player/unitframes/UnitframeBase.gd
diff --git a/game/ui/unitframes/UnitframeBase.tscn b/game/ui/player/unitframes/UnitframeBase.tscn
similarity index 97%
rename from game/ui/unitframes/UnitframeBase.tscn
rename to game/ui/player/unitframes/UnitframeBase.tscn
index a3d6a384..9b3154a8 100644
--- a/game/ui/unitframes/UnitframeBase.tscn
+++ b/game/ui/player/unitframes/UnitframeBase.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://ui/unitframes/UnitframeBase.gd" type="Script" id=1]
+[ext_resource path="res://ui/player/unitframes/UnitframeBase.gd" type="Script" id=1]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=2]
 [ext_resource path="res://ui/theme/scrollbar_grabber_red.tres" type="StyleBox" id=3]
 [ext_resource path="res://ui/theme/scrollbar_grabber_blue.tres" type="StyleBox" id=4]
diff --git a/game/ui/unitframes/Unitframes.tscn b/game/ui/player/unitframes/Unitframes.tscn
similarity index 75%
rename from game/ui/unitframes/Unitframes.tscn
rename to game/ui/player/unitframes/Unitframes.tscn
index 9cb91758..930c6a2a 100644
--- a/game/ui/unitframes/Unitframes.tscn
+++ b/game/ui/player/unitframes/Unitframes.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://player/Unitframes.gd" type="Script" id=2]
-[ext_resource path="res://ui/unitframes/UnitframeBase.tscn" type="PackedScene" id=6]
-[ext_resource path="res://ui/unitframes/TargetUnitframe.tscn" type="PackedScene" id=7]
+[ext_resource path="res://ui/player/unitframes/UnitframeBase.tscn" type="PackedScene" id=6]
+[ext_resource path="res://ui/player/unitframes/TargetUnitframe.tscn" type="PackedScene" id=7]
 
 [node name="Unitframes" type="Control"]
 anchor_right = 1.0
diff --git a/game/ui/auraframe/game_module.tres b/game/ui/player/unitframes/game_module.tres
similarity index 72%
rename from game/ui/auraframe/game_module.tres
rename to game/ui/player/unitframes/game_module.tres
index bf19038b..69e13986 100644
--- a/game/ui/auraframe/game_module.tres
+++ b/game/ui/player/unitframes/game_module.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/game_modules/ui_gui_child_module.gd" type="Script" id=1]
-[ext_resource path="res://ui/auraframe/AuraFrame.tscn" type="PackedScene" id=2]
+[ext_resource path="res://ui/player/unitframes/Unitframes.tscn" type="PackedScene" id=2]
 
 [resource]
 script = ExtResource( 1 )
diff --git a/game/ui/vendor_window/ItemContainer.gd b/game/ui/player/vendor_window/ItemContainer.gd
similarity index 100%
rename from game/ui/vendor_window/ItemContainer.gd
rename to game/ui/player/vendor_window/ItemContainer.gd
diff --git a/game/ui/vendor_window/ItemContainer.tscn b/game/ui/player/vendor_window/ItemContainer.tscn
similarity index 94%
rename from game/ui/vendor_window/ItemContainer.tscn
rename to game/ui/player/vendor_window/ItemContainer.tscn
index 8308cf2c..e21d9314 100644
--- a/game/ui/vendor_window/ItemContainer.tscn
+++ b/game/ui/player/vendor_window/ItemContainer.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1]
-[ext_resource path="res://ui/vendor_window/VendorEntryPopup.gd" type="Script" id=2]
-[ext_resource path="res://ui/vendor_window/ItemDragAndDropVendor.gd" type="Script" id=3]
-[ext_resource path="res://ui/vendor_window/ItemContainer.gd" type="Script" id=4]
+[ext_resource path="res://ui/player/vendor_window/VendorEntryPopup.gd" type="Script" id=2]
+[ext_resource path="res://ui/player/vendor_window/ItemDragAndDropVendor.gd" type="Script" id=3]
+[ext_resource path="res://ui/player/vendor_window/ItemContainer.gd" type="Script" id=4]
 
 [node name="ItemContainer" type="Control"]
 margin_left = 290.0
diff --git a/game/ui/vendor_window/ItemDragAndDropVendor.gd b/game/ui/player/vendor_window/ItemDragAndDropVendor.gd
similarity index 100%
rename from game/ui/vendor_window/ItemDragAndDropVendor.gd
rename to game/ui/player/vendor_window/ItemDragAndDropVendor.gd
diff --git a/game/ui/vendor_window/VendorEntryPopup.gd b/game/ui/player/vendor_window/VendorEntryPopup.gd
similarity index 100%
rename from game/ui/vendor_window/VendorEntryPopup.gd
rename to game/ui/player/vendor_window/VendorEntryPopup.gd
diff --git a/game/ui/vendor_window/VendorWindow.gd b/game/ui/player/vendor_window/VendorWindow.gd
similarity index 100%
rename from game/ui/vendor_window/VendorWindow.gd
rename to game/ui/player/vendor_window/VendorWindow.gd
diff --git a/game/ui/vendor_window/VendorWindow.tscn b/game/ui/player/vendor_window/VendorWindow.tscn
similarity index 96%
rename from game/ui/vendor_window/VendorWindow.tscn
rename to game/ui/player/vendor_window/VendorWindow.tscn
index 760fdea9..fa9538f0 100644
--- a/game/ui/vendor_window/VendorWindow.tscn
+++ b/game/ui/player/vendor_window/VendorWindow.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://ui/vendor_window/ItemContainer.tscn" type="PackedScene" id=1]
-[ext_resource path="res://ui/vendor_window/VendorWindow.gd" type="Script" id=4]
+[ext_resource path="res://ui/player/vendor_window/ItemContainer.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/player/vendor_window/VendorWindow.gd" type="Script" id=4]
 [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=5]
 
 [node name="VendorWindow" type="Control"]
diff --git a/game/ui/vendor_window/game_module.tres b/game/ui/player/vendor_window/game_module.tres
similarity index 72%
rename from game/ui/vendor_window/game_module.tres
rename to game/ui/player/vendor_window/game_module.tres
index df5688ed..0a05a2b4 100644
--- a/game/ui/vendor_window/game_module.tres
+++ b/game/ui/player/vendor_window/game_module.tres
@@ -1,6 +1,6 @@
 [gd_resource type="Resource" load_steps=3 format=2]
 
-[ext_resource path="res://ui/vendor_window/VendorWindow.tscn" type="PackedScene" id=1]
+[ext_resource path="res://ui/player/vendor_window/VendorWindow.tscn" type="PackedScene" id=1]
 [ext_resource path="res://scripts/game_modules/ui_window_module.gd" type="Script" id=2]
 
 [resource]