diff --git a/ZoFo/Content/Content.mgcb b/ZoFo/Content/Content.mgcb
index 271558f..1dbacc4 100644
--- a/ZoFo/Content/Content.mgcb
+++ b/ZoFo/Content/Content.mgcb
@@ -362,8 +362,7 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-<<<<<<< HEAD
-=======
+
 /build:Textures/GUI/switch.png
 
 #begin Textures/icons/12.png
@@ -496,7 +495,7 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
->>>>>>> aa6f003605d9e74d99ed25af0bb80ad8f16a352d
+
 /build:Textures/Test/pickaxe.webp
 
 #begin Textures/Test/rock.jpg
@@ -535,11 +534,8 @@
 /processorParam:TextureFormat=Color
 /build:Textures/Test/wood.jpg
 
-<<<<<<< HEAD
 #begin Textures/TileSetImages/Pipes.png
-=======
-#begin Textures/TileSets/Tilelist1.png
->>>>>>> aa6f003605d9e74d99ed25af0bb80ad8f16a352d
+
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -549,11 +545,9 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-
 /build:Textures/TileSetImages/Pipes.png
 
 #begin Textures/TileSetImages/Tilelist1.png
-
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -563,14 +557,10 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-<<<<<<< HEAD
 /build:Textures/TileSetImages/Tilelist1.png
 
 #begin Textures/TileSetImages/Tilelist2.png
-=======
-/build:Textures/TileSets/Tilelist2.png
 
-#begin Textures/TileSets/Tilelist3.png
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -580,44 +570,7 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-/build:Textures/TileSets/Tilelist3.png
 
-#begin Textures/TileSets/Tilelist4.png
-/importer:TextureImporter
-/processor:TextureProcessor
-/processorParam:ColorKeyColor=255,0,255,255
-/processorParam:ColorKeyEnabled=True
-/processorParam:GenerateMipmaps=False
-/processorParam:PremultiplyAlpha=True
-/processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
-/processorParam:TextureFormat=Color
-/build:Textures/TileSets/Tilelist4.png
-
-#begin Textures/TileSets/TilesetFloor.png
-/importer:TextureImporter
-/processor:TextureProcessor
-/processorParam:ColorKeyColor=255,0,255,255
-/processorParam:ColorKeyEnabled=True
-/processorParam:GenerateMipmaps=False
-/processorParam:PremultiplyAlpha=True
-/processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
-/processorParam:TextureFormat=Color
-/build:Textures/TileSets/TilesetFloor.png
-
-#begin Textures/TileSets/TilesetFloor.png
->>>>>>> aa6f003605d9e74d99ed25af0bb80ad8f16a352d
-/importer:TextureImporter
-/processor:TextureProcessor
-/processorParam:ColorKeyColor=255,0,255,255
-/processorParam:ColorKeyEnabled=True
-/processorParam:GenerateMipmaps=False
-/processorParam:PremultiplyAlpha=True
-/processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
-/processorParam:TextureFormat=Color
-<<<<<<< HEAD
 /build:Textures/TileSetImages/Tilelist2.png
 
 #begin Textures/TileSetImages/Tilelist3.png
@@ -835,7 +788,4 @@
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
 /build:Textures/TileSetImages/TilesetWater.png
-=======
-/build:Textures/TileSets/TilesetFloor.png
->>>>>>> aa6f003605d9e74d99ed25af0bb80ad8f16a352d
 
diff --git a/ZoFo/Content/Textures/TileSets/Pipes.png b/ZoFo/Content/Textures/TileSetImages/Pipes.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/Pipes.png
rename to ZoFo/Content/Textures/TileSetImages/Pipes.png
diff --git a/ZoFo/Content/Textures/TileSets/Tilelist1.png b/ZoFo/Content/Textures/TileSetImages/Tilelist1.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/Tilelist1.png
rename to ZoFo/Content/Textures/TileSetImages/Tilelist1.png
diff --git a/ZoFo/Content/Textures/TileSets/Tilelist2.png b/ZoFo/Content/Textures/TileSetImages/Tilelist2.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/Tilelist2.png
rename to ZoFo/Content/Textures/TileSetImages/Tilelist2.png
diff --git a/ZoFo/Content/Textures/TileSets/Tilelist3.png b/ZoFo/Content/Textures/TileSetImages/Tilelist3.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/Tilelist3.png
rename to ZoFo/Content/Textures/TileSetImages/Tilelist3.png
diff --git a/ZoFo/Content/Textures/TileSets/Tilelist4.png b/ZoFo/Content/Textures/TileSetImages/Tilelist4.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/Tilelist4.png
rename to ZoFo/Content/Textures/TileSetImages/Tilelist4.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetDesert.png b/ZoFo/Content/Textures/TileSetImages/TilesetDesert.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetDesert.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetDesert.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetDungeon.png b/ZoFo/Content/Textures/TileSetImages/TilesetDungeon.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetDungeon.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetDungeon.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetElement.png b/ZoFo/Content/Textures/TileSetImages/TilesetElement.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetElement.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetElement.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetField.png b/ZoFo/Content/Textures/TileSetImages/TilesetField.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetField.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetField.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetFloor.png b/ZoFo/Content/Textures/TileSetImages/TilesetFloor.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetFloor.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetFloor.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetFloorB.png b/ZoFo/Content/Textures/TileSetImages/TilesetFloorB.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetFloorB.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetFloorB.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetFloorDetail.png b/ZoFo/Content/Textures/TileSetImages/TilesetFloorDetail.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetFloorDetail.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetFloorDetail.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetHole.png b/ZoFo/Content/Textures/TileSetImages/TilesetHole.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetHole.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetHole.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetHouse.png b/ZoFo/Content/Textures/TileSetImages/TilesetHouse.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetHouse.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetHouse.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetLogic.png b/ZoFo/Content/Textures/TileSetImages/TilesetLogic.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetLogic.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetLogic.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetNature.png b/ZoFo/Content/Textures/TileSetImages/TilesetNature.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetNature.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetNature.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetRelief.png b/ZoFo/Content/Textures/TileSetImages/TilesetRelief.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetRelief.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetRelief.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetReliefDetail.png b/ZoFo/Content/Textures/TileSetImages/TilesetReliefDetail.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetReliefDetail.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetReliefDetail.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetTowers.png b/ZoFo/Content/Textures/TileSetImages/TilesetTowers.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetTowers.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetTowers.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetVillageAbandoned.png b/ZoFo/Content/Textures/TileSetImages/TilesetVillageAbandoned.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetVillageAbandoned.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetVillageAbandoned.png
diff --git a/ZoFo/Content/Textures/TileSets/TilesetWater.png b/ZoFo/Content/Textures/TileSetImages/TilesetWater.png
similarity index 100%
rename from ZoFo/Content/Textures/TileSets/TilesetWater.png
rename to ZoFo/Content/Textures/TileSetImages/TilesetWater.png