diff --git a/basement.json b/basement.json
index 21b5bd9..591ea35 100644
--- a/basement.json
+++ b/basement.json
@@ -431,7 +431,7 @@
         {
          "columns":8,
          "firstgid":1,
-         "image":"imgs\/floortileset.png",
+         "image":"tiles\/floortileset.png",
          "imageheight":256,
          "imagewidth":256,
          "margin":0,
@@ -450,7 +450,7 @@
         {
          "columns":16,
          "firstgid":65,
-         "image":"imgs\/tilesets_deviant_milkian_1.png",
+         "image":"tiles\/tilesets_deviant_milkian_1.png",
          "imageheight":512,
          "imagewidth":512,
          "margin":0,
@@ -469,7 +469,7 @@
         {
          "columns":18,
          "firstgid":321,
-         "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0000.png",
+         "image":"tiles\/cija_32x32_expansion for Pipoya_CC0_0000.png",
          "imageheight":2048,
          "imagewidth":576,
          "margin":0,
@@ -488,7 +488,7 @@
         {
          "columns":18,
          "firstgid":1473,
-         "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0001.png",
+         "image":"tiles\/cija_32x32_expansion for Pipoya_CC0_0001.png",
          "imageheight":2048,
          "imagewidth":576,
          "margin":0,
@@ -507,7 +507,7 @@
         {
          "columns":18,
          "firstgid":2625,
-         "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0002.png",
+         "image":"tiles\/cija_32x32_expansion for Pipoya_CC0_0002.png",
          "imageheight":160,
          "imagewidth":576,
          "margin":0,
@@ -526,7 +526,7 @@
         {
          "columns":4,
          "firstgid":2715,
-         "image":"imgs\/01_door.png",
+         "image":"tiles\/01_door.png",
          "imageheight":64,
          "imagewidth":128,
          "margin":0,
@@ -545,7 +545,7 @@
         {
          "columns":1,
          "firstgid":2723,
-         "image":"imgs\/001_beamer_32x32.png",
+         "image":"tiles\/001_beamer_32x32.png",
          "imageheight":32,
          "imagewidth":32,
          "margin":0,
@@ -564,7 +564,7 @@
         {
          "columns":5,
          "firstgid":2724,
-         "image":"imgs\/1_Palme_1_0.png",
+         "image":"tiles\/1_Palme_1_0.png",
          "imageheight":96,
          "imagewidth":160,
          "margin":0,
@@ -583,7 +583,7 @@
         {
          "columns":1,
          "firstgid":2739,
-         "image":"imgs\/02_mate_crates_1.png",
+         "image":"tiles\/02_mate_crates_1.png",
          "imageheight":96,
          "imagewidth":32,
          "margin":0,
@@ -602,7 +602,7 @@
         {
          "columns":1,
          "firstgid":2742,
-         "image":"imgs\/01_npc.png",
+         "image":"tiles\/01_npc.png",
          "imageheight":64,
          "imagewidth":32,
          "margin":0,
@@ -621,7 +621,7 @@
         {
          "columns":16,
          "firstgid":2744,
-         "image":"imgs\/06_container_front1.png",
+         "image":"tiles\/06_container_front1.png",
          "imageheight":288,
          "imagewidth":512,
          "margin":0,
@@ -640,7 +640,7 @@
         {
          "columns":16,
          "firstgid":2888,
-         "image":"imgs\/dk_lines.png",
+         "image":"tiles\/dk_lines.png",
          "imageheight":512,
          "imagewidth":512,
          "margin":0,
@@ -659,7 +659,7 @@
         {
          "columns":16,
          "firstgid":3144,
-         "image":"imgs\/dk_overlays.png",
+         "image":"tiles\/dk_overlays.png",
          "imageheight":320,
          "imagewidth":512,
          "margin":0,
@@ -678,7 +678,7 @@
         {
          "columns":7,
          "firstgid":3304,
-         "image":"imgs\/minideko.png",
+         "image":"tiles\/minideko.png",
          "imageheight":416,
          "imagewidth":224,
          "margin":0,
@@ -697,7 +697,7 @@
         {
          "columns":4,
          "firstgid":3395,
-         "image":"imgs\/nopslide.png",
+         "image":"tiles\/nopslide.png",
          "imageheight":128,
          "imagewidth":128,
          "margin":0,
@@ -716,7 +716,7 @@
         {
          "columns":1,
          "firstgid":3411,
-         "image":"imgs\/collisions.png",
+         "image":"tiles\/collisions.png",
          "imageheight":32,
          "imagewidth":32,
          "margin":0,
diff --git a/first-floor.json b/first-floor.json
index 920a50a..ba0bd44 100644
--- a/first-floor.json
+++ b/first-floor.json
@@ -417,7 +417,7 @@
         {
          "columns":8,
          "firstgid":1,
-         "image":"imgs\/floortileset.png",
+         "image":"tiles\/floortileset.png",
          "imageheight":256,
          "imagewidth":256,
          "margin":0,
@@ -436,7 +436,7 @@
         {
          "columns":16,
          "firstgid":65,
-         "image":"imgs\/tilesets_deviant_milkian_1.png",
+         "image":"tiles\/tilesets_deviant_milkian_1.png",
          "imageheight":512,
          "imagewidth":512,
          "margin":0,
@@ -455,7 +455,7 @@
         {
          "columns":18,
          "firstgid":321,
-         "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0000.png",
+         "image":"tiles\/cija_32x32_expansion for Pipoya_CC0_0000.png",
          "imageheight":2048,
          "imagewidth":576,
          "margin":0,
@@ -474,7 +474,7 @@
         {
          "columns":18,
          "firstgid":1473,
-         "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0001.png",
+         "image":"tiles\/cija_32x32_expansion for Pipoya_CC0_0001.png",
          "imageheight":2048,
          "imagewidth":576,
          "margin":0,
@@ -493,7 +493,7 @@
         {
          "columns":18,
          "firstgid":2625,
-         "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0002.png",
+         "image":"tiles\/cija_32x32_expansion for Pipoya_CC0_0002.png",
          "imageheight":160,
          "imagewidth":576,
          "margin":0,
@@ -512,7 +512,7 @@
         {
          "columns":4,
          "firstgid":2715,
-         "image":"imgs\/01_door.png",
+         "image":"tiles\/01_door.png",
          "imageheight":64,
          "imagewidth":128,
          "margin":0,
@@ -531,7 +531,7 @@
         {
          "columns":1,
          "firstgid":2723,
-         "image":"imgs\/001_beamer_32x32.png",
+         "image":"tiles\/001_beamer_32x32.png",
          "imageheight":32,
          "imagewidth":32,
          "margin":0,
@@ -550,7 +550,7 @@
         {
          "columns":5,
          "firstgid":2724,
-         "image":"imgs\/1_Palme_1_0.png",
+         "image":"tiles\/1_Palme_1_0.png",
          "imageheight":96,
          "imagewidth":160,
          "margin":0,
@@ -569,7 +569,7 @@
         {
          "columns":1,
          "firstgid":2739,
-         "image":"imgs\/02_mate_crates_1.png",
+         "image":"tiles\/02_mate_crates_1.png",
          "imageheight":96,
          "imagewidth":32,
          "margin":0,
@@ -588,7 +588,7 @@
         {
          "columns":1,
          "firstgid":2742,
-         "image":"imgs\/01_npc.png",
+         "image":"tiles\/01_npc.png",
          "imageheight":64,
          "imagewidth":32,
          "margin":0,
@@ -607,7 +607,7 @@
         {
          "columns":16,
          "firstgid":2744,
-         "image":"imgs\/06_container_front1.png",
+         "image":"tiles\/06_container_front1.png",
          "imageheight":288,
          "imagewidth":512,
          "margin":0,
@@ -626,7 +626,7 @@
         {
          "columns":16,
          "firstgid":2888,
-         "image":"imgs\/dk_lines.png",
+         "image":"tiles\/dk_lines.png",
          "imageheight":512,
          "imagewidth":512,
          "margin":0,
@@ -645,7 +645,7 @@
         {
          "columns":16,
          "firstgid":3144,
-         "image":"imgs\/dk_overlays.png",
+         "image":"tiles\/dk_overlays.png",
          "imageheight":320,
          "imagewidth":512,
          "margin":0,
@@ -664,7 +664,7 @@
         {
          "columns":7,
          "firstgid":3304,
-         "image":"imgs\/minideko.png",
+         "image":"tiles\/minideko.png",
          "imageheight":416,
          "imagewidth":224,
          "margin":0,
@@ -683,7 +683,7 @@
         {
          "columns":1,
          "firstgid":3395,
-         "image":"imgs\/collisions.png",
+         "image":"tiles\/collisions.png",
          "imageheight":32,
          "imagewidth":32,
          "margin":0,
diff --git a/heizhaus-basement.tmx b/heizhaus-basement.tmx
index 6397d90..22c0dbd 100644
--- a/heizhaus-basement.tmx
+++ b/heizhaus-basement.tmx
@@ -10,97 +10,97 @@
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/floortileset.png" width="256" height="256"/>
+  <image source="tiles/floortileset.png" width="256" height="256"/>
  </tileset>
  <tileset firstgid="65" name="tilesets_deviant_milkian_1" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/tilesets_deviant_milkian_1.png" width="512" height="512"/>
+  <image source="tiles/tilesets_deviant_milkian_1.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="321" name="cija_32x32_expansion for Pipoya_CC0 (0, 0)" tilewidth="32" tileheight="32" tilecount="1152" columns="18">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/cija_32x32_expansion for Pipoya_CC0_0000.png" width="576" height="2048"/>
+  <image source="tiles/cija_32x32_expansion for Pipoya_CC0_0000.png" width="576" height="2048"/>
  </tileset>
  <tileset firstgid="1473" name="cija_32x32_expansion for Pipoya_CC0 (0, 1)" tilewidth="32" tileheight="32" tilecount="1152" columns="18">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/cija_32x32_expansion for Pipoya_CC0_0001.png" width="576" height="2048"/>
+  <image source="tiles/cija_32x32_expansion for Pipoya_CC0_0001.png" width="576" height="2048"/>
  </tileset>
  <tileset firstgid="2625" name="cija_32x32_expansion for Pipoya_CC0 (0, 2)" tilewidth="32" tileheight="32" tilecount="90" columns="18">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/cija_32x32_expansion for Pipoya_CC0_0002.png" width="576" height="160"/>
+  <image source="tiles/cija_32x32_expansion for Pipoya_CC0_0002.png" width="576" height="160"/>
  </tileset>
  <tileset firstgid="2715" name="01_door" tilewidth="32" tileheight="32" tilecount="8" columns="4">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/01_door.png" width="128" height="64"/>
+  <image source="tiles/01_door.png" width="128" height="64"/>
  </tileset>
  <tileset firstgid="2723" name="001_beamer_32x32" tilewidth="32" tileheight="32" tilecount="1" columns="1">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/001_beamer_32x32.png" width="32" height="32"/>
+  <image source="tiles/001_beamer_32x32.png" width="32" height="32"/>
  </tileset>
  <tileset firstgid="2724" name="1_Palme_1_0" tilewidth="32" tileheight="32" tilecount="15" columns="5">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/1_Palme_1_0.png" width="160" height="96"/>
+  <image source="tiles/1_Palme_1_0.png" width="160" height="96"/>
  </tileset>
  <tileset firstgid="2739" name="02_mate_crates_1" tilewidth="32" tileheight="32" tilecount="3" columns="1">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/02_mate_crates_1.png" width="32" height="96"/>
+  <image source="tiles/02_mate_crates_1.png" width="32" height="96"/>
  </tileset>
  <tileset firstgid="2742" name="01_npc" tilewidth="32" tileheight="32" tilecount="2" columns="1">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/01_npc.png" width="32" height="64"/>
+  <image source="tiles/01_npc.png" width="32" height="64"/>
  </tileset>
  <tileset firstgid="2744" name="06_container_front1" tilewidth="32" tileheight="32" tilecount="144" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/06_container_front1.png" width="512" height="288"/>
+  <image source="tiles/06_container_front1.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="2888" name="dk_lines" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/dk_lines.png" width="512" height="512"/>
+  <image source="tiles/dk_lines.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="3144" name="dk_overlays" tilewidth="32" tileheight="32" tilecount="160" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/dk_overlays.png" width="512" height="320"/>
+  <image source="tiles/dk_overlays.png" width="512" height="320"/>
  </tileset>
  <tileset firstgid="3304" name="minideko" tilewidth="32" tileheight="32" tilecount="91" columns="7">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/minideko.png" width="224" height="416"/>
+  <image source="tiles/minideko.png" width="224" height="416"/>
  </tileset>
  <tileset firstgid="3395" name="nopslide" tilewidth="32" tileheight="32" tilecount="16" columns="4">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/nopslide.png" width="128" height="128"/>
+  <image source="tiles/nopslide.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="3411" name="collisions" tilewidth="32" tileheight="32" tilecount="1" columns="1">
   <properties>
    <property name="tilesetCopyright" value="not copyrightable"/>
   </properties>
-  <image source="imgs/collisions.png" width="32" height="32"/>
+  <image source="tiles/collisions.png" width="32" height="32"/>
   <tile id="0">
    <properties>
     <property name="collides" type="bool" value="true"/>
diff --git a/heizhaus-first-floor.tmx b/heizhaus-first-floor.tmx
index 07e41f5..8279fe0 100644
--- a/heizhaus-first-floor.tmx
+++ b/heizhaus-first-floor.tmx
@@ -10,91 +10,91 @@
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/floortileset.png" width="256" height="256"/>
+  <image source="tiles/floortileset.png" width="256" height="256"/>
  </tileset>
  <tileset firstgid="65" name="tilesets_deviant_milkian_1" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/tilesets_deviant_milkian_1.png" width="512" height="512"/>
+  <image source="tiles/tilesets_deviant_milkian_1.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="321" name="cija_32x32_expansion for Pipoya_CC0 (0, 0)" tilewidth="32" tileheight="32" tilecount="1152" columns="18">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/cija_32x32_expansion for Pipoya_CC0_0000.png" width="576" height="2048"/>
+  <image source="tiles/cija_32x32_expansion for Pipoya_CC0_0000.png" width="576" height="2048"/>
  </tileset>
  <tileset firstgid="1473" name="cija_32x32_expansion for Pipoya_CC0 (0, 1)" tilewidth="32" tileheight="32" tilecount="1152" columns="18">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/cija_32x32_expansion for Pipoya_CC0_0001.png" width="576" height="2048"/>
+  <image source="tiles/cija_32x32_expansion for Pipoya_CC0_0001.png" width="576" height="2048"/>
  </tileset>
  <tileset firstgid="2625" name="cija_32x32_expansion for Pipoya_CC0 (0, 2)" tilewidth="32" tileheight="32" tilecount="90" columns="18">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/cija_32x32_expansion for Pipoya_CC0_0002.png" width="576" height="160"/>
+  <image source="tiles/cija_32x32_expansion for Pipoya_CC0_0002.png" width="576" height="160"/>
  </tileset>
  <tileset firstgid="2715" name="01_door" tilewidth="32" tileheight="32" tilecount="8" columns="4">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/01_door.png" width="128" height="64"/>
+  <image source="tiles/01_door.png" width="128" height="64"/>
  </tileset>
  <tileset firstgid="2723" name="001_beamer_32x32" tilewidth="32" tileheight="32" tilecount="1" columns="1">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/001_beamer_32x32.png" width="32" height="32"/>
+  <image source="tiles/001_beamer_32x32.png" width="32" height="32"/>
  </tileset>
  <tileset firstgid="2724" name="1_Palme_1_0" tilewidth="32" tileheight="32" tilecount="15" columns="5">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/1_Palme_1_0.png" width="160" height="96"/>
+  <image source="tiles/1_Palme_1_0.png" width="160" height="96"/>
  </tileset>
  <tileset firstgid="2739" name="02_mate_crates_1" tilewidth="32" tileheight="32" tilecount="3" columns="1">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/02_mate_crates_1.png" width="32" height="96"/>
+  <image source="tiles/02_mate_crates_1.png" width="32" height="96"/>
  </tileset>
  <tileset firstgid="2742" name="01_npc" tilewidth="32" tileheight="32" tilecount="2" columns="1">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/01_npc.png" width="32" height="64"/>
+  <image source="tiles/01_npc.png" width="32" height="64"/>
  </tileset>
  <tileset firstgid="2744" name="06_container_front1" tilewidth="32" tileheight="32" tilecount="144" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/06_container_front1.png" width="512" height="288"/>
+  <image source="tiles/06_container_front1.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="2888" name="dk_lines" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/dk_lines.png" width="512" height="512"/>
+  <image source="tiles/dk_lines.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="3144" name="dk_overlays" tilewidth="32" tileheight="32" tilecount="160" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/dk_overlays.png" width="512" height="320"/>
+  <image source="tiles/dk_overlays.png" width="512" height="320"/>
  </tileset>
  <tileset firstgid="3304" name="minideko" tilewidth="32" tileheight="32" tilecount="91" columns="7">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/minideko.png" width="224" height="416"/>
+  <image source="tiles/minideko.png" width="224" height="416"/>
  </tileset>
  <tileset firstgid="3395" name="collisions" tilewidth="32" tileheight="32" tilecount="1" columns="1">
   <properties>
    <property name="tilesetCopyright" value="not copyrightable"/>
   </properties>
-  <image source="imgs/collisions.png" width="32" height="32"/>
+  <image source="tiles/collisions.png" width="32" height="32"/>
   <tile id="0">
    <properties>
     <property name="collides" type="bool" value="true"/>
diff --git a/heizhaus.tmx b/heizhaus.tmx
index 099044e..e2378b1 100644
--- a/heizhaus.tmx
+++ b/heizhaus.tmx
@@ -10,121 +10,121 @@
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/floortileset.png" width="256" height="256"/>
+  <image source="tiles/floortileset.png" width="256" height="256"/>
  </tileset>
  <tileset firstgid="65" name="tilesets_deviant_milkian_1" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/tilesets_deviant_milkian_1.png" width="512" height="512"/>
+  <image source="tiles/tilesets_deviant_milkian_1.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="321" name="cija_32x32_expansion for Pipoya_CC0 (0, 0)" tilewidth="32" tileheight="32" tilecount="1152" columns="18">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/cija_32x32_expansion for Pipoya_CC0_0000.png" width="576" height="2048"/>
+  <image source="tiles/cija_32x32_expansion for Pipoya_CC0_0000.png" width="576" height="2048"/>
  </tileset>
  <tileset firstgid="1473" name="cija_32x32_expansion for Pipoya_CC0 (0, 1)" tilewidth="32" tileheight="32" tilecount="1152" columns="18">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/cija_32x32_expansion for Pipoya_CC0_0001.png" width="576" height="2048"/>
+  <image source="tiles/cija_32x32_expansion for Pipoya_CC0_0001.png" width="576" height="2048"/>
  </tileset>
  <tileset firstgid="2625" name="cija_32x32_expansion for Pipoya_CC0 (0, 2)" tilewidth="32" tileheight="32" tilecount="90" columns="18">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/cija_32x32_expansion for Pipoya_CC0_0002.png" width="576" height="160"/>
+  <image source="tiles/cija_32x32_expansion for Pipoya_CC0_0002.png" width="576" height="160"/>
  </tileset>
  <tileset firstgid="2715" name="01_door" tilewidth="32" tileheight="32" tilecount="8" columns="4">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/01_door.png" width="128" height="64"/>
+  <image source="tiles/01_door.png" width="128" height="64"/>
  </tileset>
  <tileset firstgid="2723" name="001_beamer_32x32" tilewidth="32" tileheight="32" tilecount="1" columns="1">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/001_beamer_32x32.png" width="32" height="32"/>
+  <image source="tiles/001_beamer_32x32.png" width="32" height="32"/>
  </tileset>
  <tileset firstgid="2724" name="1_Palme_1_0" tilewidth="32" tileheight="32" tilecount="15" columns="5">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/1_Palme_1_0.png" width="160" height="96"/>
+  <image source="tiles/1_Palme_1_0.png" width="160" height="96"/>
  </tileset>
  <tileset firstgid="2739" name="02_mate_crates_1" tilewidth="32" tileheight="32" tilecount="3" columns="1">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/02_mate_crates_1.png" width="32" height="96"/>
+  <image source="tiles/02_mate_crates_1.png" width="32" height="96"/>
  </tileset>
  <tileset firstgid="2742" name="01_npc" tilewidth="32" tileheight="32" tilecount="2" columns="1">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/01_npc.png" width="32" height="64"/>
+  <image source="tiles/01_npc.png" width="32" height="64"/>
  </tileset>
  <tileset firstgid="2744" name="06_container_front1" tilewidth="32" tileheight="32" tilecount="144" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/06_container_front1.png" width="512" height="288"/>
+  <image source="tiles/06_container_front1.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="2888" name="dk_lines" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/dk_lines.png" width="512" height="512"/>
+  <image source="tiles/dk_lines.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="3144" name="dk_overlays" tilewidth="32" tileheight="32" tilecount="160" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/dk_overlays.png" width="512" height="320"/>
+  <image source="tiles/dk_overlays.png" width="512" height="320"/>
  </tileset>
  <tileset firstgid="3304" name="minideko" tilewidth="32" tileheight="32" tilecount="91" columns="7">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/minideko.png" width="224" height="416"/>
+  <image source="tiles/minideko.png" width="224" height="416"/>
  </tileset>
  <tileset firstgid="3395" name="worldExit" tilewidth="32" tileheight="32" tilecount="4" columns="2">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="world-tiles/rc3-2021/worldExit.png" width="64" height="64"/>
+  <image source="tiles/worldExit.png" width="64" height="64"/>
  </tileset>
  <tileset firstgid="3399" name="023_Fairydust" tilewidth="32" tileheight="32" tilecount="8" columns="2">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="world-tiles/community/cert/imgs/misc/023_Fairydust.png" width="64" height="128"/>
+  <image source="tiles/023_Fairydust.png" width="64" height="128"/>
  </tileset>
  <tileset firstgid="3407" name="wintiles" tilewidth="32" tileheight="32" tilecount="1024" columns="16">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="world-tiles/community/cert/imgs/tilesheets/wintiles.png" width="512" height="2048"/>
+  <image source="tiles/wintiles.png" width="512" height="2048"/>
  </tileset>
  <tileset firstgid="4431" name="cija_32x32_basic_CC0" tilewidth="32" tileheight="32" tilecount="600" columns="20">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="world-tiles/community/bytewerk/cija_32x32_basic_CC0.png" width="640" height="960"/>
+  <image source="tiles/cija_32x32_basic_CC0.png" width="640" height="960"/>
  </tileset>
  <tileset firstgid="5031" name="nopslide" tilewidth="32" tileheight="32" tilecount="16" columns="4">
   <properties>
    <property name="tilesetCopyright" value="CC0"/>
   </properties>
-  <image source="imgs/nopslide.png" width="128" height="128"/>
+  <image source="tiles/nopslide.png" width="128" height="128"/>
  </tileset>
  <tileset firstgid="5047" name="collisions" tilewidth="32" tileheight="32" tilecount="1" columns="1">
   <properties>
    <property name="tilesetCopyright" value="not copyrightable"/>
   </properties>
-  <image source="imgs/collisions.png" width="32" height="32"/>
+  <image source="tiles/collisions.png" width="32" height="32"/>
   <tile id="0">
    <properties>
     <property name="collides" type="bool" value="true"/>
diff --git a/main.json b/main.json
index 2c8287d..124447f 100644
--- a/main.json
+++ b/main.json
@@ -764,7 +764,7 @@
         {
          "columns":8,
          "firstgid":1,
-         "image":"imgs\/floortileset.png",
+         "image":"tiles\/floortileset.png",
          "imageheight":256,
          "imagewidth":256,
          "margin":0,
@@ -783,7 +783,7 @@
         {
          "columns":16,
          "firstgid":65,
-         "image":"imgs\/tilesets_deviant_milkian_1.png",
+         "image":"tiles\/tilesets_deviant_milkian_1.png",
          "imageheight":512,
          "imagewidth":512,
          "margin":0,
@@ -802,7 +802,7 @@
         {
          "columns":18,
          "firstgid":321,
-         "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0000.png",
+         "image":"tiles\/cija_32x32_expansion for Pipoya_CC0_0000.png",
          "imageheight":2048,
          "imagewidth":576,
          "margin":0,
@@ -821,7 +821,7 @@
         {
          "columns":18,
          "firstgid":1473,
-         "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0001.png",
+         "image":"tiles\/cija_32x32_expansion for Pipoya_CC0_0001.png",
          "imageheight":2048,
          "imagewidth":576,
          "margin":0,
@@ -840,7 +840,7 @@
         {
          "columns":18,
          "firstgid":2625,
-         "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0002.png",
+         "image":"tiles\/cija_32x32_expansion for Pipoya_CC0_0002.png",
          "imageheight":160,
          "imagewidth":576,
          "margin":0,
@@ -859,7 +859,7 @@
         {
          "columns":4,
          "firstgid":2715,
-         "image":"imgs\/01_door.png",
+         "image":"tiles\/01_door.png",
          "imageheight":64,
          "imagewidth":128,
          "margin":0,
@@ -878,7 +878,7 @@
         {
          "columns":1,
          "firstgid":2723,
-         "image":"imgs\/001_beamer_32x32.png",
+         "image":"tiles\/001_beamer_32x32.png",
          "imageheight":32,
          "imagewidth":32,
          "margin":0,
@@ -897,7 +897,7 @@
         {
          "columns":5,
          "firstgid":2724,
-         "image":"imgs\/1_Palme_1_0.png",
+         "image":"tiles\/1_Palme_1_0.png",
          "imageheight":96,
          "imagewidth":160,
          "margin":0,
@@ -916,7 +916,7 @@
         {
          "columns":1,
          "firstgid":2739,
-         "image":"imgs\/02_mate_crates_1.png",
+         "image":"tiles\/02_mate_crates_1.png",
          "imageheight":96,
          "imagewidth":32,
          "margin":0,
@@ -935,7 +935,7 @@
         {
          "columns":1,
          "firstgid":2742,
-         "image":"imgs\/01_npc.png",
+         "image":"tiles\/01_npc.png",
          "imageheight":64,
          "imagewidth":32,
          "margin":0,
@@ -954,7 +954,7 @@
         {
          "columns":16,
          "firstgid":2744,
-         "image":"imgs\/06_container_front1.png",
+         "image":"tiles\/06_container_front1.png",
          "imageheight":288,
          "imagewidth":512,
          "margin":0,
@@ -973,7 +973,7 @@
         {
          "columns":16,
          "firstgid":2888,
-         "image":"imgs\/dk_lines.png",
+         "image":"tiles\/dk_lines.png",
          "imageheight":512,
          "imagewidth":512,
          "margin":0,
@@ -992,7 +992,7 @@
         {
          "columns":16,
          "firstgid":3144,
-         "image":"imgs\/dk_overlays.png",
+         "image":"tiles\/dk_overlays.png",
          "imageheight":320,
          "imagewidth":512,
          "margin":0,
@@ -1011,7 +1011,7 @@
         {
          "columns":7,
          "firstgid":3304,
-         "image":"imgs\/minideko.png",
+         "image":"tiles\/minideko.png",
          "imageheight":416,
          "imagewidth":224,
          "margin":0,
@@ -1030,7 +1030,7 @@
         {
          "columns":2,
          "firstgid":3395,
-         "image":"world-tiles\/rc3-2021\/worldExit.png",
+         "image":"tiles\/worldExit.png",
          "imageheight":64,
          "imagewidth":64,
          "margin":0,
@@ -1049,7 +1049,7 @@
         {
          "columns":2,
          "firstgid":3399,
-         "image":"world-tiles\/community\/cert\/imgs\/misc\/023_Fairydust.png",
+         "image":"tiles\/023_Fairydust.png",
          "imageheight":128,
          "imagewidth":64,
          "margin":0,
@@ -1068,7 +1068,7 @@
         {
          "columns":16,
          "firstgid":3407,
-         "image":"world-tiles\/community\/cert\/imgs\/tilesheets\/wintiles.png",
+         "image":"tiles\/wintiles.png",
          "imageheight":2048,
          "imagewidth":512,
          "margin":0,
@@ -1087,7 +1087,7 @@
         {
          "columns":20,
          "firstgid":4431,
-         "image":"world-tiles\/community\/bytewerk\/cija_32x32_basic_CC0.png",
+         "image":"tiles\/cija_32x32_basic_CC0.png",
          "imageheight":960,
          "imagewidth":640,
          "margin":0,
@@ -1106,7 +1106,7 @@
         {
          "columns":4,
          "firstgid":5031,
-         "image":"imgs\/nopslide.png",
+         "image":"tiles\/nopslide.png",
          "imageheight":128,
          "imagewidth":128,
          "margin":0,
@@ -1125,7 +1125,7 @@
         {
          "columns":1,
          "firstgid":5047,
-         "image":"imgs\/collisions.png",
+         "image":"tiles\/collisions.png",
          "imageheight":32,
          "imagewidth":32,
          "margin":0,
diff --git a/mapcleanup.py b/mapcleanup.py
index f118463..f5351a6 100755
--- a/mapcleanup.py
+++ b/mapcleanup.py
@@ -113,7 +113,7 @@ def separate_collisions(map):
             name="tilesetCopyright",
             value="not copyrightable",
         )
-        image_source = Path("imgs") / "collisions.png"
+        image_source = Path("tiles") / "collisions.png"
         image_source.parent.mkdir(parents=True, exist_ok=True)
         Image.new("1", (32, 32), (1)).save(image_source)
         etree.SubElement(
diff --git a/imgs/001_beamer_32x32.png b/tiles/001_beamer_32x32.png
similarity index 100%
rename from imgs/001_beamer_32x32.png
rename to tiles/001_beamer_32x32.png
diff --git a/imgs/01_door.png b/tiles/01_door.png
similarity index 100%
rename from imgs/01_door.png
rename to tiles/01_door.png
diff --git a/imgs/01_npc.png b/tiles/01_npc.png
similarity index 100%
rename from imgs/01_npc.png
rename to tiles/01_npc.png
diff --git a/tiles/023_Fairydust.png b/tiles/023_Fairydust.png
new file mode 100644
index 0000000..cd8c358
Binary files /dev/null and b/tiles/023_Fairydust.png differ
diff --git a/imgs/02_mate_crates_1.png b/tiles/02_mate_crates_1.png
similarity index 100%
rename from imgs/02_mate_crates_1.png
rename to tiles/02_mate_crates_1.png
diff --git a/imgs/06_container_front1.png b/tiles/06_container_front1.png
similarity index 100%
rename from imgs/06_container_front1.png
rename to tiles/06_container_front1.png
diff --git a/imgs/1_Palme_1_0.png b/tiles/1_Palme_1_0.png
similarity index 100%
rename from imgs/1_Palme_1_0.png
rename to tiles/1_Palme_1_0.png
diff --git a/tiles/cija_32x32_basic_CC0.png b/tiles/cija_32x32_basic_CC0.png
new file mode 100644
index 0000000..f730391
Binary files /dev/null and b/tiles/cija_32x32_basic_CC0.png differ
diff --git a/imgs/cija_32x32_expansion for Pipoya_CC0_0000.png b/tiles/cija_32x32_expansion for Pipoya_CC0_0000.png
similarity index 100%
rename from imgs/cija_32x32_expansion for Pipoya_CC0_0000.png
rename to tiles/cija_32x32_expansion for Pipoya_CC0_0000.png
diff --git a/imgs/cija_32x32_expansion for Pipoya_CC0_0001.png b/tiles/cija_32x32_expansion for Pipoya_CC0_0001.png
similarity index 100%
rename from imgs/cija_32x32_expansion for Pipoya_CC0_0001.png
rename to tiles/cija_32x32_expansion for Pipoya_CC0_0001.png
diff --git a/imgs/cija_32x32_expansion for Pipoya_CC0_0002.png b/tiles/cija_32x32_expansion for Pipoya_CC0_0002.png
similarity index 100%
rename from imgs/cija_32x32_expansion for Pipoya_CC0_0002.png
rename to tiles/cija_32x32_expansion for Pipoya_CC0_0002.png
diff --git a/imgs/collisions.png b/tiles/collisions.png
similarity index 100%
rename from imgs/collisions.png
rename to tiles/collisions.png
diff --git a/imgs/dk_lines.png b/tiles/dk_lines.png
similarity index 100%
rename from imgs/dk_lines.png
rename to tiles/dk_lines.png
diff --git a/imgs/dk_overlays.png b/tiles/dk_overlays.png
similarity index 100%
rename from imgs/dk_overlays.png
rename to tiles/dk_overlays.png
diff --git a/imgs/floortileset.png b/tiles/floortileset.png
similarity index 100%
rename from imgs/floortileset.png
rename to tiles/floortileset.png
diff --git a/imgs/minideko.png b/tiles/minideko.png
similarity index 100%
rename from imgs/minideko.png
rename to tiles/minideko.png
diff --git a/imgs/nopslide.png b/tiles/nopslide.png
similarity index 100%
rename from imgs/nopslide.png
rename to tiles/nopslide.png
diff --git a/imgs/tilesets_deviant_milkian_1.png b/tiles/tilesets_deviant_milkian_1.png
similarity index 100%
rename from imgs/tilesets_deviant_milkian_1.png
rename to tiles/tilesets_deviant_milkian_1.png
diff --git a/tiles/wintiles.png b/tiles/wintiles.png
new file mode 100644
index 0000000..507d886
Binary files /dev/null and b/tiles/wintiles.png differ
diff --git a/tiles/worldExit.png b/tiles/worldExit.png
new file mode 100644
index 0000000..b1d15b3
Binary files /dev/null and b/tiles/worldExit.png differ