diff --git a/src/App.vue b/src/App.vue
index 9b9864d..8af1e4b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup lang="ts">
-import GmPanel from '@/components/gameMaster/GmPanel.vue'
+import GmPanel from '@/components/game/gameMaster/GmPanel.vue'
 import Characters from '@/components/screens/Characters.vue'
 import Game from '@/components/screens/Game.vue'
 import Loading from '@/components/screens/Loading.vue'
diff --git a/src/components/gameMaster/GmPanel.vue b/src/components/game/gameMaster/GmPanel.vue
similarity index 93%
rename from src/components/gameMaster/GmPanel.vue
rename to src/components/game/gameMaster/GmPanel.vue
index 0854219..28e4cf4 100644
--- a/src/components/gameMaster/GmPanel.vue
+++ b/src/components/game/gameMaster/GmPanel.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script setup lang="ts">
-import AssetManager from '@/components/gameMaster/assetManager/AssetManager.vue'
+import AssetManager from '@/components/game/gameMaster/assetManager/AssetManager.vue'
 import Modal from '@/components/utilities/Modal.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
diff --git a/src/components/gameMaster/assetManager/AssetManager.vue b/src/components/game/gameMaster/assetManager/AssetManager.vue
similarity index 77%
rename from src/components/gameMaster/assetManager/AssetManager.vue
rename to src/components/game/gameMaster/assetManager/AssetManager.vue
index fc7c2bc..9b97649 100644
--- a/src/components/gameMaster/assetManager/AssetManager.vue
+++ b/src/components/game/gameMaster/assetManager/AssetManager.vue
@@ -60,18 +60,18 @@
 </template>
 
 <script setup lang="ts">
-import CharacterHairDetails from '@/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue'
-import CharacterHairList from '@/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue'
-import CharacterTypeDetails from '@/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue'
-import CharacterTypeList from '@/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue'
-import ItemDetails from '@/components/gameMaster/assetManager/partials/item/itemDetails.vue'
-import ItemList from '@/components/gameMaster/assetManager/partials/item/itemList.vue'
-import MapObjectDetails from '@/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue'
-import MapObjectList from '@/components/gameMaster/assetManager/partials/mapObject/MapObjectList.vue'
-import SpriteDetails from '@/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue'
-import SpriteList from '@/components/gameMaster/assetManager/partials/sprite/SpriteList.vue'
-import TileDetails from '@/components/gameMaster/assetManager/partials/tile/TileDetails.vue'
-import TileList from '@/components/gameMaster/assetManager/partials/tile/TileList.vue'
+import CharacterHairDetails from '@/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue'
+import CharacterHairList from '@/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue'
+import CharacterTypeDetails from '@/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue'
+import CharacterTypeList from '@/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue'
+import ItemDetails from '@/components/game/gameMaster/assetManager/partials/item/itemDetails.vue'
+import ItemList from '@/components/game/gameMaster/assetManager/partials/item/itemList.vue'
+import MapObjectDetails from '@/components/game/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue'
+import MapObjectList from '@/components/game/gameMaster/assetManager/partials/mapObject/MapObjectList.vue'
+import SpriteDetails from '@/components/game/gameMaster/assetManager/partials/sprite/SpriteDetails.vue'
+import SpriteList from '@/components/game/gameMaster/assetManager/partials/sprite/SpriteList.vue'
+import TileDetails from '@/components/game/gameMaster/assetManager/partials/tile/TileDetails.vue'
+import TileList from '@/components/game/gameMaster/assetManager/partials/tile/TileList.vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { ref } from 'vue'
 
diff --git a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue b/src/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
rename to src/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
diff --git a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue b/src/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
rename to src/components/game/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
diff --git a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue b/src/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
rename to src/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
diff --git a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue b/src/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
rename to src/components/game/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
diff --git a/src/components/gameMaster/assetManager/partials/item/itemDetails.vue b/src/components/game/gameMaster/assetManager/partials/item/itemDetails.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/item/itemDetails.vue
rename to src/components/game/gameMaster/assetManager/partials/item/itemDetails.vue
diff --git a/src/components/gameMaster/assetManager/partials/item/itemList.vue b/src/components/game/gameMaster/assetManager/partials/item/itemList.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/item/itemList.vue
rename to src/components/game/gameMaster/assetManager/partials/item/itemList.vue
diff --git a/src/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue b/src/components/game/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue
rename to src/components/game/gameMaster/assetManager/partials/mapObject/MapObjectDetails.vue
diff --git a/src/components/gameMaster/assetManager/partials/mapObject/MapObjectList.vue b/src/components/game/gameMaster/assetManager/partials/mapObject/MapObjectList.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/mapObject/MapObjectList.vue
rename to src/components/game/gameMaster/assetManager/partials/mapObject/MapObjectList.vue
diff --git a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue b/src/components/game/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
similarity index 98%
rename from src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
rename to src/components/game/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
index f11d55a..3b9107b 100644
--- a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
+++ b/src/components/game/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
@@ -71,7 +71,7 @@
 <script setup lang="ts">
 import type { Sprite, SpriteAction } from '@/application/types'
 import { uuidv4 } from '@/application/utilities'
-import SpriteActionsInput from '@/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue'
+import SpriteActionsInput from '@/components/game/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue'
 import Accordion from '@/components/utilities/Accordion.vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
diff --git a/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue b/src/components/game/gameMaster/assetManager/partials/sprite/SpriteList.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
rename to src/components/game/gameMaster/assetManager/partials/sprite/SpriteList.vue
diff --git a/src/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue b/src/components/game/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue
rename to src/components/game/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue
diff --git a/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue b/src/components/game/gameMaster/assetManager/partials/tile/TileDetails.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
rename to src/components/game/gameMaster/assetManager/partials/tile/TileDetails.vue
diff --git a/src/components/gameMaster/assetManager/partials/tile/TileList.vue b/src/components/game/gameMaster/assetManager/partials/tile/TileList.vue
similarity index 100%
rename from src/components/gameMaster/assetManager/partials/tile/TileList.vue
rename to src/components/game/gameMaster/assetManager/partials/tile/TileList.vue
diff --git a/src/components/gameMaster/mapEditor/MapEditor.vue b/src/components/game/gameMaster/mapEditor/MapEditor.vue
similarity index 71%
rename from src/components/gameMaster/mapEditor/MapEditor.vue
rename to src/components/game/gameMaster/mapEditor/MapEditor.vue
index 2d0d69a..2f323f6 100644
--- a/src/components/gameMaster/mapEditor/MapEditor.vue
+++ b/src/components/game/gameMaster/mapEditor/MapEditor.vue
@@ -15,15 +15,15 @@
 
 <script setup lang="ts">
 import { type Map } from '@/application/types'
-import MapEventTiles from '@/components/gameMaster/mapEditor/mapPartials/MapEventTiles.vue'
-import MapTiles from '@/components/gameMaster/mapEditor/mapPartials/MapTiles.vue'
-import PlacedMapObjects from '@/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue'
-import MapList from '@/components/gameMaster/mapEditor/partials/MapList.vue'
-import ObjectList from '@/components/gameMaster/mapEditor/partials/MapObjectList.vue'
-import MapSettings from '@/components/gameMaster/mapEditor/partials/MapSettings.vue'
-import TeleportModal from '@/components/gameMaster/mapEditor/partials/TeleportModal.vue'
-import TileList from '@/components/gameMaster/mapEditor/partials/TileList.vue'
-import Toolbar from '@/components/gameMaster/mapEditor/partials/Toolbar.vue'
+import MapEventTiles from '@/components/game/gameMaster/mapEditor/mapPartials/MapEventTiles.vue'
+import MapTiles from '@/components/game/gameMaster/mapEditor/mapPartials/MapTiles.vue'
+import PlacedMapObjects from '@/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue'
+import MapList from '@/components/game/gameMaster/mapEditor/partials/MapList.vue'
+import ObjectList from '@/components/game/gameMaster/mapEditor/partials/MapObjectList.vue'
+import MapSettings from '@/components/game/gameMaster/mapEditor/partials/MapSettings.vue'
+import TeleportModal from '@/components/game/gameMaster/mapEditor/partials/TeleportModal.vue'
+import TileList from '@/components/game/gameMaster/mapEditor/partials/TileList.vue'
+import Toolbar from '@/components/game/gameMaster/mapEditor/partials/Toolbar.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { onUnmounted, shallowRef } from 'vue'
diff --git a/src/components/gameMaster/mapEditor/mapPartials/MapEventTiles.vue b/src/components/game/gameMaster/mapEditor/mapPartials/MapEventTiles.vue
similarity index 100%
rename from src/components/gameMaster/mapEditor/mapPartials/MapEventTiles.vue
rename to src/components/game/gameMaster/mapEditor/mapPartials/MapEventTiles.vue
diff --git a/src/components/gameMaster/mapEditor/mapPartials/MapTiles.vue b/src/components/game/gameMaster/mapEditor/mapPartials/MapTiles.vue
similarity index 94%
rename from src/components/gameMaster/mapEditor/mapPartials/MapTiles.vue
rename to src/components/game/gameMaster/mapEditor/mapPartials/MapTiles.vue
index 3db3c6c..5676da1 100644
--- a/src/components/gameMaster/mapEditor/mapPartials/MapTiles.vue
+++ b/src/components/game/gameMaster/mapEditor/mapPartials/MapTiles.vue
@@ -177,14 +177,17 @@ function tilePicker(pointer: Phaser.Input.Pointer) {
   mapEditorStore.setSelectedTile(mapEditorStore.map.tiles[tile.y][tile.x])
 }
 
-watch(() => mapEditorStore.shouldClearTiles, (shouldClear) => {
-  if (shouldClear && mapEditorStore.map && tileMap.value && tileLayer.value) {
-    const blankTiles = createTileArray(tileMap.value.width, tileMap.value.height, 'blank_tile')
-    setLayerTiles(tileMap.value, tileLayer.value, blankTiles)
-    mapEditorStore.map.tiles = blankTiles
-    mapEditorStore.resetClearTilesFlag()
+watch(
+  () => mapEditorStore.shouldClearTiles,
+  (shouldClear) => {
+    if (shouldClear && mapEditorStore.map && tileMap.value && tileLayer.value) {
+      const blankTiles = createTileArray(tileMap.value.width, tileMap.value.height, 'blank_tile')
+      setLayerTiles(tileMap.value, tileLayer.value, blankTiles)
+      mapEditorStore.map.tiles = blankTiles
+      mapEditorStore.resetClearTilesFlag()
+    }
   }
-})
+)
 
 onMounted(async () => {
   if (!mapEditorStore.map?.tiles) return
diff --git a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue b/src/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue
similarity index 100%
rename from src/components/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue
rename to src/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue
diff --git a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue b/src/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
similarity index 97%
rename from src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
rename to src/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
index f08b1ea..dbb8790 100644
--- a/src/components/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
+++ b/src/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObjects.vue
@@ -6,8 +6,8 @@
 <script setup lang="ts">
 import type { PlacedMapObject as PlacedMapObjectT } from '@/application/types'
 import { uuidv4 } from '@/application/utilities'
-import PlacedMapObject from '@/components/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue'
-import SelectedPlacedMapObjectComponent from '@/components/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue'
+import PlacedMapObject from '@/components/game/gameMaster/mapEditor/mapPartials/PlacedMapObject.vue'
+import SelectedPlacedMapObjectComponent from '@/components/game/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue'
 import { getTile } from '@/composables/mapComposable'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { useScene } from 'phavuer'
diff --git a/src/components/gameMaster/mapEditor/partials/CreateMap.vue b/src/components/game/gameMaster/mapEditor/partials/CreateMap.vue
similarity index 100%
rename from src/components/gameMaster/mapEditor/partials/CreateMap.vue
rename to src/components/game/gameMaster/mapEditor/partials/CreateMap.vue
diff --git a/src/components/gameMaster/mapEditor/partials/MapList.vue b/src/components/game/gameMaster/mapEditor/partials/MapList.vue
similarity index 96%
rename from src/components/gameMaster/mapEditor/partials/MapList.vue
rename to src/components/game/gameMaster/mapEditor/partials/MapList.vue
index 51bb699..f4d8dc8 100644
--- a/src/components/gameMaster/mapEditor/partials/MapList.vue
+++ b/src/components/game/gameMaster/mapEditor/partials/MapList.vue
@@ -27,7 +27,7 @@
 
 <script setup lang="ts">
 import type { Map, UUID } from '@/application/types'
-import CreateMap from '@/components/gameMaster/mapEditor/partials/CreateMap.vue'
+import CreateMap from '@/components/game/gameMaster/mapEditor/partials/CreateMap.vue'
 import Modal from '@/components/utilities/Modal.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
diff --git a/src/components/gameMaster/mapEditor/partials/MapObjectList.vue b/src/components/game/gameMaster/mapEditor/partials/MapObjectList.vue
similarity index 100%
rename from src/components/gameMaster/mapEditor/partials/MapObjectList.vue
rename to src/components/game/gameMaster/mapEditor/partials/MapObjectList.vue
diff --git a/src/components/gameMaster/mapEditor/partials/MapSettings.vue b/src/components/game/gameMaster/mapEditor/partials/MapSettings.vue
similarity index 100%
rename from src/components/gameMaster/mapEditor/partials/MapSettings.vue
rename to src/components/game/gameMaster/mapEditor/partials/MapSettings.vue
diff --git a/src/components/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue b/src/components/game/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue
similarity index 100%
rename from src/components/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue
rename to src/components/game/gameMaster/mapEditor/partials/SelectedPlacedMapObject.vue
diff --git a/src/components/gameMaster/mapEditor/partials/TeleportModal.vue b/src/components/game/gameMaster/mapEditor/partials/TeleportModal.vue
similarity index 100%
rename from src/components/gameMaster/mapEditor/partials/TeleportModal.vue
rename to src/components/game/gameMaster/mapEditor/partials/TeleportModal.vue
diff --git a/src/components/gameMaster/mapEditor/partials/TileList.vue b/src/components/game/gameMaster/mapEditor/partials/TileList.vue
similarity index 100%
rename from src/components/gameMaster/mapEditor/partials/TileList.vue
rename to src/components/game/gameMaster/mapEditor/partials/TileList.vue
diff --git a/src/components/gameMaster/mapEditor/partials/Toolbar.vue b/src/components/game/gameMaster/mapEditor/partials/Toolbar.vue
similarity index 100%
rename from src/components/gameMaster/mapEditor/partials/Toolbar.vue
rename to src/components/game/gameMaster/mapEditor/partials/Toolbar.vue
diff --git a/src/components/gui/CharacterProfile.vue b/src/components/game/gui/CharacterProfile.vue
similarity index 100%
rename from src/components/gui/CharacterProfile.vue
rename to src/components/game/gui/CharacterProfile.vue
diff --git a/src/components/gui/Chat.vue b/src/components/game/gui/Chat.vue
similarity index 100%
rename from src/components/gui/Chat.vue
rename to src/components/game/gui/Chat.vue
diff --git a/src/components/gui/Clock.vue b/src/components/game/gui/Clock.vue
similarity index 100%
rename from src/components/gui/Clock.vue
rename to src/components/game/gui/Clock.vue
diff --git a/src/components/gui/ExpBar.vue b/src/components/game/gui/ExpBar.vue
similarity index 100%
rename from src/components/gui/ExpBar.vue
rename to src/components/game/gui/ExpBar.vue
diff --git a/src/components/gui/Hotkeys.vue b/src/components/game/gui/Hotkeys.vue
similarity index 100%
rename from src/components/gui/Hotkeys.vue
rename to src/components/game/gui/Hotkeys.vue
diff --git a/src/components/gui/Hud.vue b/src/components/game/gui/Hud.vue
similarity index 100%
rename from src/components/gui/Hud.vue
rename to src/components/game/gui/Hud.vue
diff --git a/src/components/gui/Menu.vue b/src/components/game/gui/Menu.vue
similarity index 100%
rename from src/components/gui/Menu.vue
rename to src/components/game/gui/Menu.vue
diff --git a/src/components/gui/Minimap.vue b/src/components/game/gui/Minimap.vue
similarity index 100%
rename from src/components/gui/Minimap.vue
rename to src/components/game/gui/Minimap.vue
diff --git a/src/components/gui/UserPanel.vue b/src/components/game/gui/UserPanel.vue
similarity index 90%
rename from src/components/gui/UserPanel.vue
rename to src/components/game/gui/UserPanel.vue
index 5ec08cb..7e7034f 100644
--- a/src/components/gui/UserPanel.vue
+++ b/src/components/game/gui/UserPanel.vue
@@ -30,10 +30,10 @@
 </template>
 
 <script setup lang="ts">
-import CharacterScreen from '@/components/gui/partials/CharacterScreen.vue'
-import Equipment from '@/components/gui/partials/Equipment.vue'
-import Inventory from '@/components/gui/partials/Inventory.vue'
-import Settings from '@/components/gui/partials/Settings.vue'
+import CharacterScreen from '@/components/game/gui/partials/CharacterScreen.vue'
+import Equipment from '@/components/game/gui/partials/Equipment.vue'
+import Inventory from '@/components/game/gui/partials/Inventory.vue'
+import Settings from '@/components/game/gui/partials/Settings.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { ref } from 'vue'
 
diff --git a/src/components/gui/partials/CharacterScreen.vue b/src/components/game/gui/partials/CharacterScreen.vue
similarity index 100%
rename from src/components/gui/partials/CharacterScreen.vue
rename to src/components/game/gui/partials/CharacterScreen.vue
diff --git a/src/components/gui/partials/Equipment.vue b/src/components/game/gui/partials/Equipment.vue
similarity index 100%
rename from src/components/gui/partials/Equipment.vue
rename to src/components/game/gui/partials/Equipment.vue
diff --git a/src/components/gui/partials/Inventory.vue b/src/components/game/gui/partials/Inventory.vue
similarity index 100%
rename from src/components/gui/partials/Inventory.vue
rename to src/components/game/gui/partials/Inventory.vue
diff --git a/src/components/gui/partials/Settings.vue b/src/components/game/gui/partials/Settings.vue
similarity index 94%
rename from src/components/gui/partials/Settings.vue
rename to src/components/game/gui/partials/Settings.vue
index 56df8db..fc02942 100644
--- a/src/components/gui/partials/Settings.vue
+++ b/src/components/game/gui/partials/Settings.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script setup lang="ts">
-import CharacterSettings from '@/components/gui/partials/settings/CharacterSettings.vue'
+import CharacterSettings from '@/components/game/gui/partials/settings/CharacterSettings.vue'
 import { ref } from 'vue'
 
 let settingCategory = ref('character')
diff --git a/src/components/gui/partials/settings/CharacterSettings.vue b/src/components/game/gui/partials/settings/CharacterSettings.vue
similarity index 100%
rename from src/components/gui/partials/settings/CharacterSettings.vue
rename to src/components/game/gui/partials/settings/CharacterSettings.vue
diff --git a/src/components/game/map/Map.vue b/src/components/game/map/Map.vue
index ddf35ed..a9a6df7 100644
--- a/src/components/game/map/Map.vue
+++ b/src/components/game/map/Map.vue
@@ -1,7 +1,7 @@
 <template>
   <MapTiles :key="mapStore.mapId" @tileMap:create="tileMap = $event" />
-  <PlacedMapObjects v-if="tileMap" :key="mapStore.mapId" :tilemap="tileMap as Phaser.Tilemaps.Tilemap" />
-  <Characters v-if="tileMap" :tilemap="tileMap as Phaser.Tilemaps.Tilemap" />
+  <PlacedMapObjects v-if="tileMap" :key="mapStore.mapId" :tilemap="tileMap" />
+  <Characters v-if="tileMap && mapStore.characters" :tilemap="tileMap" />
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/game/map/PlacedMapObjects.vue b/src/components/game/map/PlacedMapObjects.vue
index 46a2267..2b9f2f4 100644
--- a/src/components/game/map/PlacedMapObjects.vue
+++ b/src/components/game/map/PlacedMapObjects.vue
@@ -5,9 +5,9 @@
 <script setup lang="ts">
 import type { PlacedMapObject as PlacedMapObjectT } from '@/application/types'
 import PlacedMapObject from '@/components/game/map/partials/PlacedMapObject.vue'
+import { MapStorage } from '@/storage/storages'
 import { useMapStore } from '@/stores/mapStore'
 import { onMounted, ref } from 'vue'
-import { MapStorage } from '@/storage/storages'
 
 defineProps<{
   tilemap: Phaser.Tilemaps.Tilemap
diff --git a/src/components/game/map/partials/PlacedMapObject.vue b/src/components/game/map/partials/PlacedMapObject.vue
index a62fcc5..78d8125 100644
--- a/src/components/game/map/partials/PlacedMapObject.vue
+++ b/src/components/game/map/partials/PlacedMapObject.vue
@@ -39,7 +39,5 @@ loadTexture(scene, {
   console.error('Error loading texture:', error)
 })
 
-onMounted(async () => {
-  
-})
+onMounted(async () => {})
 </script>
diff --git a/src/components/screens/Game.vue b/src/components/screens/Game.vue
index 59f0fa7..8c520da 100644
--- a/src/components/screens/Game.vue
+++ b/src/components/screens/Game.vue
@@ -21,16 +21,15 @@
 import config from '@/application/config'
 import 'phaser'
 import Effects from '@/components/Effects.vue'
+import CharacterProfile from '@/components/game/gui/CharacterProfile.vue'
+import Chat from '@/components/game/gui/Chat.vue'
+import Clock from '@/components/game/gui/Clock.vue'
+import ExpBar from '@/components/game/gui/ExpBar.vue'
+import Hotkeys from '@/components/game/gui/Hotkeys.vue'
+import Hud from '@/components/game/gui/Hud.vue'
+import Menu from '@/components/game/gui/Menu.vue'
 import Map from '@/components/game/map/Map.vue'
-import CharacterProfile from '@/components/gui/CharacterProfile.vue'
-import Chat from '@/components/gui/Chat.vue'
-import Clock from '@/components/gui/Clock.vue'
-import ExpBar from '@/components/gui/ExpBar.vue'
-import Hotkeys from '@/components/gui/Hotkeys.vue'
-import Hud from '@/components/gui/Hud.vue'
-import Menu from '@/components/gui/Menu.vue'
 import { useGameStore } from '@/stores/gameStore'
-import AwaitLoaderPlugin from 'phaser3-rex-plugins/plugins/awaitloader-plugin'
 import { Game, Scene } from 'phavuer'
 import { onBeforeUnmount } from 'vue'
 
diff --git a/src/components/screens/MapEditor.vue b/src/components/screens/MapEditor.vue
index 5b7e06c..5064cdb 100644
--- a/src/components/screens/MapEditor.vue
+++ b/src/components/screens/MapEditor.vue
@@ -11,7 +11,7 @@
 <script setup lang="ts">
 import config from '@/application/config'
 import 'phaser'
-import MapEditor from '@/components/gameMaster/mapEditor/MapEditor.vue'
+import MapEditor from '@/components/game/gameMaster/mapEditor/MapEditor.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useMapEditorStore } from '@/stores/mapEditorStore'
 import { Game, Scene } from 'phavuer'