diff --git a/PckStudio.Core/Properties/Resources.resx b/PckStudio.Core/Properties/Resources.resx
index df7cea2f..8f34aa3e 100644
--- a/PckStudio.Core/Properties/Resources.resx
+++ b/PckStudio.Core/Properties/Resources.resx
@@ -119,67 +119,67 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="additionalMapiconsData" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\additionalMapiconsData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\atlas\additionalMapiconsData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="additional_map_icons_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\additional_mapicons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\atlas\additional_mapicons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bannerData" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bannerData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
+    <value>..\Resources\atlas\bannerData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
   <data name="banners_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\banners.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\atlas\banners.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="blockData" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\blockData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
+    <value>..\Resources\atlas\blockData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
   <data name="Comparison" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Comparison.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="experienceOrbData" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\experienceOrbData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
+    <value>..\Resources\atlas\experienceOrbData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
   <data name="experience_orbs_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\experience_orbs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\atlas\experience_orbs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="explosionData" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\explosionData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
+    <value>..\Resources\atlas\explosionData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
   <data name="explosions_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\explosion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\atlas\explosion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="itemData" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\itemData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
+    <value>..\Resources\atlas\itemData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
   <data name="items_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\items.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\atlas\items.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="mapIconData" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mapIconData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
+    <value>..\Resources\atlas\mapIconData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
   <data name="map_icons_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\map_icons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\atlas\map_icons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="moonPhaseData" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\moonPhaseData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
+    <value>..\Resources\atlas\moonPhaseData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
   <data name="moon_phases_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\moon_phases.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\atlas\moon_phases.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="paintingData" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\paintingData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    <value>..\Resources\atlas\paintingData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="paintings_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\paintings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\atlas\paintings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="particleData" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\particleData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
+    <value>..\Resources\atlas\particleData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
   </data>
   <data name="particles_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\particles.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\atlas\particles.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="terrain_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\terrain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\atlas\terrain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="TexturePackIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TexturePackIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
diff --git a/PckStudio.Core/Resources/additionalMapiconsData.json b/PckStudio.Core/Resources/atlas/additionalMapiconsData.json
similarity index 100%
rename from PckStudio.Core/Resources/additionalMapiconsData.json
rename to PckStudio.Core/Resources/atlas/additionalMapiconsData.json
diff --git a/PckStudio.Core/Resources/additional_mapicons.png b/PckStudio.Core/Resources/atlas/additional_mapicons.png
similarity index 100%
rename from PckStudio.Core/Resources/additional_mapicons.png
rename to PckStudio.Core/Resources/atlas/additional_mapicons.png
diff --git a/PckStudio.Core/Resources/bannerData.json b/PckStudio.Core/Resources/atlas/bannerData.json
similarity index 100%
rename from PckStudio.Core/Resources/bannerData.json
rename to PckStudio.Core/Resources/atlas/bannerData.json
diff --git a/PckStudio.Core/Resources/banners.png b/PckStudio.Core/Resources/atlas/banners.png
similarity index 100%
rename from PckStudio.Core/Resources/banners.png
rename to PckStudio.Core/Resources/atlas/banners.png
diff --git a/PckStudio.Core/Resources/blockData.json b/PckStudio.Core/Resources/atlas/blockData.json
similarity index 100%
rename from PckStudio.Core/Resources/blockData.json
rename to PckStudio.Core/Resources/atlas/blockData.json
diff --git a/PckStudio.Core/Resources/experienceOrbData.json b/PckStudio.Core/Resources/atlas/experienceOrbData.json
similarity index 100%
rename from PckStudio.Core/Resources/experienceOrbData.json
rename to PckStudio.Core/Resources/atlas/experienceOrbData.json
diff --git a/PckStudio.Core/Resources/experience_orbs.png b/PckStudio.Core/Resources/atlas/experience_orbs.png
similarity index 100%
rename from PckStudio.Core/Resources/experience_orbs.png
rename to PckStudio.Core/Resources/atlas/experience_orbs.png
diff --git a/PckStudio.Core/Resources/explosion.png b/PckStudio.Core/Resources/atlas/explosion.png
similarity index 100%
rename from PckStudio.Core/Resources/explosion.png
rename to PckStudio.Core/Resources/atlas/explosion.png
diff --git a/PckStudio.Core/Resources/explosionData.json b/PckStudio.Core/Resources/atlas/explosionData.json
similarity index 100%
rename from PckStudio.Core/Resources/explosionData.json
rename to PckStudio.Core/Resources/atlas/explosionData.json
diff --git a/PckStudio.Core/Resources/itemData.json b/PckStudio.Core/Resources/atlas/itemData.json
similarity index 100%
rename from PckStudio.Core/Resources/itemData.json
rename to PckStudio.Core/Resources/atlas/itemData.json
diff --git a/PckStudio.Core/Resources/items.png b/PckStudio.Core/Resources/atlas/items.png
similarity index 100%
rename from PckStudio.Core/Resources/items.png
rename to PckStudio.Core/Resources/atlas/items.png
diff --git a/PckStudio.Core/Resources/mapIconData.json b/PckStudio.Core/Resources/atlas/mapIconData.json
similarity index 100%
rename from PckStudio.Core/Resources/mapIconData.json
rename to PckStudio.Core/Resources/atlas/mapIconData.json
diff --git a/PckStudio.Core/Resources/map_icons.png b/PckStudio.Core/Resources/atlas/map_icons.png
similarity index 100%
rename from PckStudio.Core/Resources/map_icons.png
rename to PckStudio.Core/Resources/atlas/map_icons.png
diff --git a/PckStudio.Core/Resources/moonPhaseData.json b/PckStudio.Core/Resources/atlas/moonPhaseData.json
similarity index 100%
rename from PckStudio.Core/Resources/moonPhaseData.json
rename to PckStudio.Core/Resources/atlas/moonPhaseData.json
diff --git a/PckStudio.Core/Resources/moon_phases.png b/PckStudio.Core/Resources/atlas/moon_phases.png
similarity index 100%
rename from PckStudio.Core/Resources/moon_phases.png
rename to PckStudio.Core/Resources/atlas/moon_phases.png
diff --git a/PckStudio.Core/Resources/paintingData.json b/PckStudio.Core/Resources/atlas/paintingData.json
similarity index 100%
rename from PckStudio.Core/Resources/paintingData.json
rename to PckStudio.Core/Resources/atlas/paintingData.json
diff --git a/PckStudio.Core/Resources/paintings.png b/PckStudio.Core/Resources/atlas/paintings.png
similarity index 100%
rename from PckStudio.Core/Resources/paintings.png
rename to PckStudio.Core/Resources/atlas/paintings.png
diff --git a/PckStudio.Core/Resources/particleData.json b/PckStudio.Core/Resources/atlas/particleData.json
similarity index 100%
rename from PckStudio.Core/Resources/particleData.json
rename to PckStudio.Core/Resources/atlas/particleData.json
diff --git a/PckStudio.Core/Resources/particles.png b/PckStudio.Core/Resources/atlas/particles.png
similarity index 100%
rename from PckStudio.Core/Resources/particles.png
rename to PckStudio.Core/Resources/atlas/particles.png
diff --git a/PckStudio.Core/Resources/terrain.png b/PckStudio.Core/Resources/atlas/terrain.png
similarity index 100%
rename from PckStudio.Core/Resources/terrain.png
rename to PckStudio.Core/Resources/atlas/terrain.png
diff --git a/PckStudio.Core/Resources/ender.png b/PckStudio.Core/Resources/ender.png
new file mode 100644
index 00000000..3631d0dd
Binary files /dev/null and b/PckStudio.Core/Resources/ender.png differ
diff --git a/PckStudio.Core/Resources/lead_knot.png b/PckStudio.Core/Resources/lead_knot.png
new file mode 100644
index 00000000..ab4d3b3a
Binary files /dev/null and b/PckStudio.Core/Resources/lead_knot.png differ
diff --git a/PckStudio.Core/Resources/minecart.png b/PckStudio.Core/Resources/minecart.png
new file mode 100644
index 00000000..7ad7b54f
Binary files /dev/null and b/PckStudio.Core/Resources/minecart.png differ
diff --git a/PckStudio.Core/Resources/normal.png b/PckStudio.Core/Resources/normal.png
new file mode 100644
index 00000000..2e3d7fde
Binary files /dev/null and b/PckStudio.Core/Resources/normal.png differ
diff --git a/PckStudio.Core/Resources/normal_double.png b/PckStudio.Core/Resources/normal_double.png
new file mode 100644
index 00000000..01683381
Binary files /dev/null and b/PckStudio.Core/Resources/normal_double.png differ
diff --git a/PckStudio.Core/Resources/sign.png b/PckStudio.Core/Resources/sign.png
new file mode 100644
index 00000000..e22e2f78
Binary files /dev/null and b/PckStudio.Core/Resources/sign.png differ
diff --git a/PckStudio.Core/Resources/trapped.png b/PckStudio.Core/Resources/trapped.png
new file mode 100644
index 00000000..3aef1901
Binary files /dev/null and b/PckStudio.Core/Resources/trapped.png differ
diff --git a/PckStudio.Core/Resources/trapped_double.png b/PckStudio.Core/Resources/trapped_double.png
new file mode 100644
index 00000000..00eebe5d
Binary files /dev/null and b/PckStudio.Core/Resources/trapped_double.png differ