diff --git a/src/components/forms/ChipsInput.vue b/src/components/forms/ChipsInput.vue
index 0c6140f..0fcf4ad 100644
--- a/src/components/forms/ChipsInput.vue
+++ b/src/components/forms/ChipsInput.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { ref } from 'vue'
 import type { Ref } from 'vue'
 
 interface Props {
diff --git a/src/components/utilities/assetManager/partials/ObjectDetails.vue b/src/components/utilities/assetManager/partials/ObjectDetails.vue
index 1b4df65..2b4ee2e 100644
--- a/src/components/utilities/assetManager/partials/ObjectDetails.vue
+++ b/src/components/utilities/assetManager/partials/ObjectDetails.vue
@@ -24,6 +24,13 @@
           <label class="mb-1.5 font-titles" for="origin-x">Tags</label>
           <ChipsInput v-model="objectTags" @update:modelValue="objectTags = $event" />
         </div>
+        <div class="w-full flex flex-col mb-5">
+          <label class="mb-1.5 font-titles" for="origin-x">Is animated</label>
+          <select v-model="objectIsAnimated" class="input-cyan">
+            <option value="0">No</option>
+            <option value="1">Yes</option>
+          </select>
+        </div>
         <button class="btn-cyan px-4 py-1.5 min-w-24" type="submit">Save</button>
       </form>
     </div>
@@ -49,6 +56,7 @@ const objectName = ref('')
 const objectTags = ref([] as string[])
 const objectOriginX = ref(0)
 const objectOriginY = ref(0)
+const objectIsAnimated = ref(0)
 
 if (!selectedObject.value) {
   console.error('No object selected')
@@ -59,6 +67,7 @@ if (selectedObject.value) {
   objectTags.value = selectedObject.value.tags
   objectOriginX.value = selectedObject.value.origin_x
   objectOriginY.value = selectedObject.value.origin_y
+  objectIsAnimated.value = selectedObject.value.is_animated
 }
 
 function removeObject() {
diff --git a/src/components/utilities/zoneEditor/ZoneEditor.vue b/src/components/utilities/zoneEditor/ZoneEditor.vue
index 74e21c1..f4a6aaa 100644
--- a/src/components/utilities/zoneEditor/ZoneEditor.vue
+++ b/src/components/utilities/zoneEditor/ZoneEditor.vue
@@ -35,17 +35,17 @@ import { Container, Image, TilemapLayer as TilemapLayerC, useScene } from 'phavu
 import { onBeforeMount, onBeforeUnmount, ref, toRaw, watch } from 'vue'
 import Controls from '@/components/utilities/Controls.vue'
 import { useGameStore } from '@/stores/game'
-import Toolbar from '@/components/utilities/zoneEditor/Toolbar.vue'
-import Tiles from '@/components/utilities/zoneEditor/Tiles.vue'
-import SelectedZoneObject from '@/components/utilities/zoneEditor/SelectedZoneObject.vue'
+import Toolbar from '@/components/utilities/zoneEditor/partials/Toolbar.vue'
+import Tiles from '@/components/utilities/zoneEditor/partials/Tiles.vue'
+import SelectedZoneObject from '@/components/utilities/zoneEditor/partials/SelectedZoneObject.vue'
 import { useZoneEditorStore } from '@/stores/zoneEditor'
-import ZoneSettings from '@/components/utilities/zoneEditor/ZoneSettings.vue'
+import ZoneSettings from '@/components/utilities/zoneEditor/partials/ZoneSettings.vue'
 import { placeTile, setAllTiles, tileToWorldX, tileToWorldY } from '@/services/zone'
 import { useAssetStore } from '@/stores/assets'
-import Objects from '@/components/utilities/zoneEditor/Objects.vue'
+import Objects from '@/components/utilities/zoneEditor/partials/Objects.vue'
 import type { Zone, ZoneEventTile, ZoneObject } from '@/types'
 import { storeToRefs } from 'pinia'
-import ZoneList from '@/components/utilities/zoneEditor/ZoneList.vue'
+import ZoneList from '@/components/utilities/zoneEditor/partials/ZoneList.vue'
 import Tileset = Phaser.Tilemaps.Tileset
 import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 
diff --git a/src/components/utilities/zoneEditor/CreateZone.vue b/src/components/utilities/zoneEditor/partials/CreateZone.vue
similarity index 100%
rename from src/components/utilities/zoneEditor/CreateZone.vue
rename to src/components/utilities/zoneEditor/partials/CreateZone.vue
diff --git a/src/components/utilities/zoneEditor/Objects.vue b/src/components/utilities/zoneEditor/partials/Objects.vue
similarity index 100%
rename from src/components/utilities/zoneEditor/Objects.vue
rename to src/components/utilities/zoneEditor/partials/Objects.vue
diff --git a/src/components/utilities/zoneEditor/SelectedZoneObject.vue b/src/components/utilities/zoneEditor/partials/SelectedZoneObject.vue
similarity index 100%
rename from src/components/utilities/zoneEditor/SelectedZoneObject.vue
rename to src/components/utilities/zoneEditor/partials/SelectedZoneObject.vue
diff --git a/src/components/utilities/zoneEditor/Tiles.vue b/src/components/utilities/zoneEditor/partials/Tiles.vue
similarity index 100%
rename from src/components/utilities/zoneEditor/Tiles.vue
rename to src/components/utilities/zoneEditor/partials/Tiles.vue
diff --git a/src/components/utilities/zoneEditor/Toolbar.vue b/src/components/utilities/zoneEditor/partials/Toolbar.vue
similarity index 100%
rename from src/components/utilities/zoneEditor/Toolbar.vue
rename to src/components/utilities/zoneEditor/partials/Toolbar.vue
diff --git a/src/components/utilities/zoneEditor/ZoneList.vue b/src/components/utilities/zoneEditor/partials/ZoneList.vue
similarity index 96%
rename from src/components/utilities/zoneEditor/ZoneList.vue
rename to src/components/utilities/zoneEditor/partials/ZoneList.vue
index fc9acc0..428118d 100644
--- a/src/components/utilities/zoneEditor/ZoneList.vue
+++ b/src/components/utilities/zoneEditor/partials/ZoneList.vue
@@ -34,7 +34,7 @@ import { useGameStore } from '@/stores/game'
 import Modal from '@/components/utilities/Modal.vue'
 import type { Zone } from '@/types'
 import { useZoneEditorStore } from '@/stores/zoneEditor'
-import CreateZone from '@/components/utilities/zoneEditor/CreateZone.vue'
+import CreateZone from '@/components/utilities/zoneEditor/partials/CreateZone.vue'
 
 const gameStore = useGameStore()
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/utilities/zoneEditor/ZoneSettings.vue b/src/components/utilities/zoneEditor/partials/ZoneSettings.vue
similarity index 100%
rename from src/components/utilities/zoneEditor/ZoneSettings.vue
rename to src/components/utilities/zoneEditor/partials/ZoneSettings.vue