diff --git a/ZoFo/Content/MapData/MapSession.tiled-session b/ZoFo/Content/MapData/MapSession.tiled-session
index acfc369..cb7759e 100644
--- a/ZoFo/Content/MapData/MapSession.tiled-session
+++ b/ZoFo/Content/MapData/MapSession.tiled-session
@@ -1,78 +1,36 @@
 {
-    "Map/SizeTest": {
-        "height": 4300,
-        "width": 2
-    },
-    "activeFile": "TileMaps/main.tmj",
+    "activeFile": "",
     "expandedProjectPaths": [
-        ".",
-        "TileSets",
-        "TileMaps"
     ],
     "fileStates": {
-        "": {
-            "scaleInDock": 1
-        },
-        "TileMaps/TileSets/TileSet 1.tsj": {
-            "scaleInDock": 1
-        },
         "TileMaps/main.tmj": {
-            "scale": 0.33,
-            "selectedLayer": 1,
+            "scale": 0.5,
+            "selectedLayer": 0,
             "viewCenter": {
-                "x": 1010.6060606060606,
-                "y": 553.0303030303031
+                "x": 745,
+                "y": 756
             }
         },
-        "TileMaps/main.tmj#IconSet": {
-            "dynamicWrapping": true,
-            "scaleInEditor": 1
-        },
-        "TileSets/CollisionTileSet.tsj": {
-            "scaleInDock": 0.75,
-            "scaleInEditor": 1
-        },
         "TileSets/IconSet.tsj": {
             "dynamicWrapping": true
         },
         "TileSets/TileSet 1.tsj": {
-            "dynamicWrapping": false,
-            "scaleInDock": 1,
-            "scaleInEditor": 1.5
-        },
-        "TileSets/TilesetNature.tsj": {
-            "dynamicWrapping": false
             "scaleInDock": 1
         },
-        "TileSets/WallSet.tsj": {
-            "scaleInDock": 1,
-            "scaleInEditor": 1
+        "TileSets/TilesetNature.tsj": {
+            "scaleInDock": 1.5
         },
         "TileSets/tileset 1 collision.tsj": {
+            "dynamicWrapping": false,
             "scaleInDock": 1
         }
     },
     "last.imagePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/Textures/icons",
-    "last.objectTemplatePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/MapData/Templates",
+    "last.objectTemplatePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/MapData/Templates/Enemies",
     "openFiles": [
-        "TileSets/TileSet 1.tsj",
-        "TileMaps/main.tmj"
     ],
     "project": "MapSession.tiled-project",
     "recentFiles": [
-        "TileSets/TileSet 1.tsj",
-        "TileMaps/main.tmj",
-        "TileSets/CollisionTileSet.tsj",
-        "TileSets/WallSet.tsj"
-    ],
-    "stampsFolder": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/MapData/TileStamps",
-    "tileset.embedInMap": false,
-    "tileset.lastUsedFormat": "json",
-    "tileset.margin": 0,
-    "tileset.spacing": 0,
-    "tileset.tileSize": {
-        "height": 16,
-        "width": 16
-    },
-    "tileset.type": 1
+        "TileMaps/main.tmj"
+    ]
 }
diff --git a/ZoFo/Content/MapData/Templates/Ammo.tj b/ZoFo/Content/MapData/Templates/Collectables/Ammo.tj
similarity index 100%
rename from ZoFo/Content/MapData/Templates/Ammo.tj
rename to ZoFo/Content/MapData/Templates/Collectables/Ammo.tj
diff --git a/ZoFo/Content/MapData/Templates/BottleOfWater.tj b/ZoFo/Content/MapData/Templates/Collectables/BottleOfWater.tj
similarity index 100%
rename from ZoFo/Content/MapData/Templates/BottleOfWater.tj
rename to ZoFo/Content/MapData/Templates/Collectables/BottleOfWater.tj
diff --git a/ZoFo/Content/MapData/Templates/Peeble.tj b/ZoFo/Content/MapData/Templates/Collectables/Peeble.tj
similarity index 100%
rename from ZoFo/Content/MapData/Templates/Peeble.tj
rename to ZoFo/Content/MapData/Templates/Collectables/Peeble.tj
diff --git a/ZoFo/Content/MapData/Templates/PureBottleOfWater.tj b/ZoFo/Content/MapData/Templates/Collectables/PureBottleOfWater.tj
similarity index 100%
rename from ZoFo/Content/MapData/Templates/PureBottleOfWater.tj
rename to ZoFo/Content/MapData/Templates/Collectables/PureBottleOfWater.tj
diff --git a/ZoFo/Content/MapData/Templates/RottenFlesh.tj b/ZoFo/Content/MapData/Templates/Collectables/RottenFlesh.tj
similarity index 100%
rename from ZoFo/Content/MapData/Templates/RottenFlesh.tj
rename to ZoFo/Content/MapData/Templates/Collectables/RottenFlesh.tj
diff --git a/ZoFo/Content/MapData/Templates/Steel.tj b/ZoFo/Content/MapData/Templates/Collectables/Steel.tj
similarity index 100%
rename from ZoFo/Content/MapData/Templates/Steel.tj
rename to ZoFo/Content/MapData/Templates/Collectables/Steel.tj
diff --git a/ZoFo/Content/MapData/Templates/Wood.tj b/ZoFo/Content/MapData/Templates/Collectables/Wood.tj
similarity index 100%
rename from ZoFo/Content/MapData/Templates/Wood.tj
rename to ZoFo/Content/MapData/Templates/Collectables/Wood.tj
diff --git a/ZoFo/Content/MapData/Templates/Enemies/Zombie.tj b/ZoFo/Content/MapData/Templates/Enemies/Zombie.tj
new file mode 100644
index 0000000..463fc47
--- /dev/null
+++ b/ZoFo/Content/MapData/Templates/Enemies/Zombie.tj
@@ -0,0 +1,18 @@
+{ "object":
+    {
+     "gid":8,
+     "height":16,
+     "id":1,
+     "name":"Zombie",
+     "rotation":0,
+     "type":"",
+     "visible":true,
+     "width":16
+    },
+ "tileset":
+    {
+     "firstgid":1,
+     "source":"..\/..\/TileSets\/IconSet.tsj"
+    },
+ "type":"template"
+}
\ No newline at end of file
diff --git a/ZoFo/Content/MapData/TileMaps/main.tmj b/ZoFo/Content/MapData/TileMaps/main.tmj
index 136574c..d9910a3 100644
--- a/ZoFo/Content/MapData/TileMaps/main.tmj
+++ b/ZoFo/Content/MapData/TileMaps/main.tmj
@@ -2113,15 +2113,15 @@
                  "x":112,
                  "y":80
                 }],
-         "height":144,
+         "height":96,
          "id":5,
          "name":"Collidable",
          "opacity":1,
-         "startx":-16,
-         "starty":-16,
+         "startx":0,
+         "starty":0,
          "type":"tilelayer",
          "visible":true,
-         "width":208,
+         "width":128,
          "x":0,
          "y":0
         }, 
@@ -2148,10 +2148,10 @@
          "y":0
         }],
  "nextlayerid":6,
- "nextobjectid":1,
+ "nextobjectid":2,
  "orientation":"orthogonal",
  "renderorder":"right-down",
- "tiledversion":"1.11.0",
+ "tiledversion":"1.10.2",
  "tileheight":16,
  "tilesets":[
         {
@@ -2165,6 +2165,10 @@
         {
          "firstgid":813,
          "source":"..\/TileSets\/TilesetNature.tsj"
+        }, 
+        {
+         "firstgid":1317,
+         "source":"..\/TileSets\/IconSet.tsj"
         }],
  "tilewidth":16,
  "type":"map",
diff --git a/ZoFo/Content/MapData/TileSets/IconSet.tsj b/ZoFo/Content/MapData/TileSets/IconSet.tsj
index 186df25..3ec8f51 100644
--- a/ZoFo/Content/MapData/TileSets/IconSet.tsj
+++ b/ZoFo/Content/MapData/TileSets/IconSet.tsj
@@ -8,51 +8,57 @@
  "margin":0,
  "name":"IconSet",
  "spacing":0,
- "tilecount":7,
+ "tilecount":8,
  "tiledversion":"1.10.2",
  "tileheight":1200,
  "tiles":[
         {
          "id":0,
-         "image":"..\/..\/Textures\/icons\/Collectables\/ammunition.png",
+         "image":"..\/..\/Textures\/icons\/Collectables\/Ammo.png",
          "imageheight":512,
          "imagewidth":512
         }, 
         {
          "id":1,
-         "image":"..\/..\/Textures\/icons\/Collectables\/Blue Potion.png",
+         "image":"..\/..\/Textures\/icons\/Collectables\/PureBottleOfWater.png",
          "imageheight":32,
          "imagewidth":32
         }, 
         {
          "id":2,
-         "image":"..\/..\/Textures\/icons\/Collectables\/Water Bottle.png",
+         "image":"..\/..\/Textures\/icons\/Collectables\/BottleOfWater.png",
          "imageheight":32,
          "imagewidth":32
         }, 
         {
          "id":3,
-         "image":"..\/..\/Textures\/icons\/Collectables\/Wood Log.png",
+         "image":"..\/..\/Textures\/icons\/Collectables\/Wood.png",
          "imageheight":32,
          "imagewidth":32
         }, 
         {
          "id":4,
-         "image":"..\/..\/Textures\/icons\/Collectables\/Silver Ingot.png",
+         "image":"..\/..\/Textures\/icons\/Collectables\/Steel.png",
          "imageheight":32,
          "imagewidth":32
         }, 
         {
          "id":5,
-         "image":"..\/..\/Textures\/icons\/Collectables\/Monster Meat.png",
+         "image":"..\/..\/Textures\/icons\/Collectables\/RottenFlesh.png",
          "imageheight":32,
          "imagewidth":32
         }, 
         {
          "id":6,
-         "image":"..\/..\/Textures\/icons\/Collectables\/Stone.png",
+         "image":"..\/..\/Textures\/icons\/Collectables\/Peeble.png",
          "imageheight":1200,
          "imagewidth":1200
+        }, 
+        {
+         "id":7,
+         "image":"..\/..\/Textures\/icons\/zombie_218153.png",
+         "imageheight":512,
+         "imagewidth":512
         }],
  "tilewidth":1200,
  "type":"tileset",
diff --git a/ZoFo/Content/MapData/TileSets/TileSet 1.tsj b/ZoFo/Content/MapData/TileSets/TileSet 1.tsj
index 9e9f4b1..4ab1e98 100644
--- a/ZoFo/Content/MapData/TileSets/TileSet 1.tsj	
+++ b/ZoFo/Content/MapData/TileSets/TileSet 1.tsj	
@@ -470,6 +470,23 @@
          "type":"Tile"
         }, 
         {
+         "animation":[
+                {
+                 "duration":100,
+                 "tileid":111
+                }, 
+                {
+                 "duration":100,
+                 "tileid":112
+                }, 
+                {
+                 "duration":100,
+                 "tileid":113
+                }, 
+                {
+                 "duration":100,
+                 "tileid":114
+                }],
          "id":111,
          "probability":0.100000001490116,
          "type":"Tile"
diff --git a/ZoFo/Content/Textures/icons/zombie_218153.png b/ZoFo/Content/Textures/icons/zombie_218153.png
new file mode 100644
index 0000000..9f73e6e
Binary files /dev/null and b/ZoFo/Content/Textures/icons/zombie_218153.png differ