37 files changed, 84 insertions, 106 deletions
diff --git a/Mundus Build 30-04-2020 No2.exe b/Mundus Build 30-04-2020 No3.exe
index abce32f..825b500 100644
--- a/Mundus Build 30-04-2020 No2.exe
+++ b/Mundus Build 30-04-2020 No3.exe
diff --git a/Mundus/Data/Crafting/RI.cs b/Mundus/Data/Crafting/RI.cs
index b24eea5..10a8b89 100644
--- a/Mundus/Data/Crafting/RI.cs
+++ b/Mundus/Data/Crafting/RI.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using Mundus.Service.Crafting;
-using Mundus.Service.Tiles.ItemPresets;
+using Mundus.Service.Tiles.Crafting;
+using Mundus.Service.Tiles.Items.Presets;
 
 namespace Mundus.Data.Crafting {
     public static class RI { //short for Recipe Instances
diff --git a/Mundus/Data/SuperLayers/ISuperLayer.cs b/Mundus/Data/SuperLayers/ISuperLayer.cs
index 733df32..8f140ad 100644
--- a/Mundus/Data/SuperLayers/ISuperLayer.cs
+++ b/Mundus/Data/SuperLayers/ISuperLayer.cs
@@ -1,4 +1,4 @@
-using Mundus.Service.Tiles;
+using Mundus.Service.Tiles.Mobs;
 using Mundus.Service.Tiles.Items;
 
 namespace Mundus.Data.SuperLayers {
diff --git a/Mundus/Data/SuperLayers/Land.cs b/Mundus/Data/SuperLayers/Land.cs
index 2f4e16c..73ffd17 100644
--- a/Mundus/Data/SuperLayers/Land.cs
+++ b/Mundus/Data/SuperLayers/Land.cs
@@ -1,4 +1,4 @@
-using Mundus.Service.Tiles;
+using Mundus.Service.Tiles.Mobs;
 using Mundus.Service.Tiles.Items;
 
 namespace Mundus.Data.SuperLayers {
diff --git a/Mundus/Data/SuperLayers/Mobs/MI.cs b/Mundus/Data/SuperLayers/Mobs/MI.cs
index fa498a9..45cf99a 100644
--- a/Mundus/Data/SuperLayers/Mobs/MI.cs
+++ b/Mundus/Data/SuperLayers/Mobs/MI.cs
@@ -1,6 +1,6 @@
 using Mundus.Data.SuperLayers;
-using Mundus.Service.Mobs.LandMobs;
-using Mundus.Service.Tiles.ItemPresets;
+using Mundus.Service.Tiles.Mobs.LandMobs;
+using Mundus.Service.Tiles.Items.Presets;
 
 namespace Mundus.Data.Superlayers.Mobs {
     public static class MI { //stands for Mob Instances
diff --git a/Mundus/Data/SuperLayers/Sky.cs b/Mundus/Data/SuperLayers/Sky.cs
index ee408c0..cb4343d 100644
--- a/Mundus/Data/SuperLayers/Sky.cs
+++ b/Mundus/Data/SuperLayers/Sky.cs
@@ -1,5 +1,5 @@
 using System;
-using Mundus.Service.Tiles;
+using Mundus.Service.Tiles.Mobs;
 using Mundus.Service.Tiles.Items;
 
 namespace Mundus.Data.SuperLayers {
diff --git a/Mundus/Data/SuperLayers/Underground.cs b/Mundus/Data/SuperLayers/Underground.cs
index 22d13c0..d78930a 100644
--- a/Mundus/Data/SuperLayers/Underground.cs
+++ b/Mundus/Data/SuperLayers/Underground.cs
@@ -1,5 +1,5 @@
 using System;
-using Mundus.Service.Tiles;
+using Mundus.Service.Tiles.Mobs;
 using Mundus.Service.Tiles.Items;
 
 namespace Mundus.Data.SuperLayers {
diff --git a/Mundus/Data/Windows/WI.cs b/Mundus/Data/Windows/WI.cs
index 0f064fb..566539c 100644
--- a/Mundus/Data/Windows/WI.cs
+++ b/Mundus/Data/Windows/WI.cs
@@ -1,8 +1,9 @@
 using Mundus.Views.Windows;
+using Mundus.Views.Windows.GameWindows;
 
 namespace Mundus.Data.Windows {
     public static class WI { //stands for Window Instances
-        public const string BuildName = "Build 30-04-2020 No2";
+        public const string BuildName = "Build 30-04-2020 No3";
 
         public static IGameWindow SelWin { get; set; }
 
diff --git a/Mundus/Mundus.csproj b/Mundus/Mundus.csproj
index 6ccae13..4e8894b 100644
--- a/Mundus/Mundus.csproj
+++ b/Mundus/Mundus.csproj
@@ -91,11 +91,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Views\Windows\NewGameWindow.cs" />
     <Compile Include="gtk-gui\Mundus.Views.Windows.NewGameWindow.cs" />
-    <Compile Include="Views\Windows\SmallGameWindow.cs" />
     <Compile Include="gtk-gui\Mundus.Views.Windows.SmallGameWindow.cs" />
-    <Compile Include="Views\Windows\MediumGameWindow.cs" />
     <Compile Include="gtk-gui\Mundus.Views.Windows.MediumGameWindow.cs" />
-    <Compile Include="Views\Windows\LargeGameWindow.cs" />
     <Compile Include="gtk-gui\Mundus.Views.Windows.LargeGameWindow.cs" />
     <Compile Include="Views\Windows\SettingsWindow.cs" />
     <Compile Include="gtk-gui\Mundus.Views.Windows.SettingsWindow.cs" />
@@ -110,12 +107,7 @@
     <Compile Include="Views\Dialogs\ExitDialog.cs" />
     <Compile Include="gtk-gui\Mundus.Views.Dialogs.ExitDialog.cs" />
     <Compile Include="Service\Tiles\ITile.cs" />
-    <Compile Include="Service\Inventory.cs" />
-    <Compile Include="Views\Windows\IGameWindow.cs" />
     <Compile Include="Data\MapSizes.cs" />
-    <Compile Include="Service\SwitchItems.cs">
-      <IncludeInPackage>true</IncludeInPackage>
-    </Compile>
     <Compile Include="Service\SuperLayers\ImageController.cs" />
     <Compile Include="Service\Calculate.cs" />
     <Compile Include="Data\Windows\WI.cs" />
@@ -132,32 +124,40 @@
     <Compile Include="Data\Tiles\ToolTypes.cs" />
     <Compile Include="Service\Tiles\Items\Material.cs" />
     <Compile Include="Service\Tiles\Items\Gear.cs" />
-    <Compile Include="Service\Crafting\CraftingRecipe.cs" />
-    <Compile Include="Service\Crafting\CraftingController.cs" />
     <Compile Include="Data\Crafting\RI.cs" />
-    <Compile Include="Service\Tiles\ItemPresets\ToolPresets.cs" />
-    <Compile Include="Service\Tiles\ItemPresets\MaterialPresets.cs" />
     <Compile Include="Data\SuperLayers\Underground.cs" />
     <Compile Include="Service\SuperLayers\Generators\LandSuperLayerGenerator.cs" />
     <Compile Include="Service\SuperLayers\Generators\UndergroundSuperLayerGenerator.cs" />
-    <Compile Include="Service\Tiles\ItemPresets\StructurePresets.cs" />
     <Compile Include="Service\Tiles\Items\GroundTile.cs" />
-    <Compile Include="Service\Tiles\ItemPresets\GroundPresets.cs" />
     <Compile Include="Service\SuperLayers\HeightController.cs" />
     <Compile Include="Data\SuperLayers\Sky.cs" />
     <Compile Include="Service\SuperLayers\Generators\SkySuperLayerGenerator.cs" />
-    <Compile Include="Service\Mobs\LandMobs\LandMobsPresets.cs" />
-    <Compile Include="Service\Mobs\MobTile.cs" />
-    <Compile Include="Service\Mobs\Controllers\MobFighting.cs" />
-    <Compile Include="Service\Mobs\Controllers\MobMovement.cs" />
-    <Compile Include="Service\Mobs\Controllers\MobStatsController.cs" />
-    <Compile Include="Service\Mobs\Controllers\MobTerraforming.cs" />
-    <Compile Include="Service\Mobs\LandMobs\Player.cs" />
     <Compile Include="Data\Difficulty.cs" />
     <Compile Include="Data\Log.cs" />
     <Compile Include="Service\LogController.cs" />
     <Compile Include="Views\Windows\LogWindow.cs" />
     <Compile Include="gtk-gui\Mundus.Views.Windows.LogWindow.cs" />
+    <Compile Include="Service\Tiles\Mobs\Controllers\MobFighting.cs" />
+    <Compile Include="Service\Tiles\Mobs\Controllers\MobMovement.cs" />
+    <Compile Include="Service\Tiles\Mobs\Controllers\MobStatsController.cs" />
+    <Compile Include="Service\Tiles\Mobs\Controllers\MobTerraforming.cs" />
+    <Compile Include="Service\Tiles\Mobs\LandMobs\LandMobsPresets.cs" />
+    <Compile Include="Service\Tiles\Mobs\LandMobs\Player.cs" />
+    <Compile Include="Service\Tiles\Mobs\MobTile.cs" />
+    <Compile Include="Service\Tiles\Mobs\Inventory.cs" />
+    <Compile Include="Service\Tiles\Items\SwitchItems.cs">
+      <IncludeInPackage>true</IncludeInPackage>
+    </Compile>
+    <Compile Include="Service\Tiles\Crafting\CraftingController.cs" />
+    <Compile Include="Service\Tiles\Crafting\CraftingRecipe.cs" />
+    <Compile Include="Service\Tiles\Items\Presets\GroundPresets.cs" />
+    <Compile Include="Service\Tiles\Items\Presets\MaterialPresets.cs" />
+    <Compile Include="Service\Tiles\Items\Presets\StructurePresets.cs" />
+    <Compile Include="Service\Tiles\Items\Presets\ToolPresets.cs" />
+    <Compile Include="Views\Windows\GameWindows\IGameWindow.cs" />
+    <Compile Include="Views\Windows\GameWindows\LargeGameWindow.cs" />
+    <Compile Include="Views\Windows\GameWindows\MediumGameWindow.cs" />
+    <Compile Include="Views\Windows\GameWindows\SmallGameWindow.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Service\" />
@@ -168,21 +168,20 @@
     <Folder Include="Service\SuperLayers\" />
     <Folder Include="Service\Tiles\" />
     <Folder Include="Icons\Land\Ground\" />
-    <Folder Include="Service\Mobs\" />
-    <Folder Include="Service\Mobs\LandMobs\" />
     <Folder Include="Data\Windows\" />
     <Folder Include="Data\Dialogues\" />
     <Folder Include="Data\SuperLayers\" />
     <Folder Include="Data\SuperLayers\Mobs\" />
     <Folder Include="Service\Tiles\Items\" />
     <Folder Include="Data\Tiles\" />
-    <Folder Include="Service\Crafting\" />
     <Folder Include="Data\Crafting\" />
-    <Folder Include="Service\Tiles\ItemPresets\" />
     <Folder Include="Icons\Land\Materials\" />
     <Folder Include="Service\SuperLayers\Generators\" />
     <Folder Include="Icons\Sky\Ground\" />
-    <Folder Include="Service\Mobs\Controllers\" />
+    <Folder Include="Service\Tiles\Mobs\" />
+    <Folder Include="Service\Tiles\Crafting\" />
+    <Folder Include="Service\Tiles\Items\Presets\" />
+    <Folder Include="Views\Windows\GameWindows\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs b/Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs
index b073fb3..d5412f1 100644
--- a/Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs
+++ b/Mundus/Service/SuperLayers/Generators/LandSuperLayerGenerator.cs
@@ -2,9 +2,9 @@
 using Mundus.Data;
 using Mundus.Data.Superlayers.Mobs;
 using Mundus.Data.SuperLayers;
-using Mundus.Service.Mobs.LandMobs;
-using Mundus.Service.Tiles;
-using Mundus.Service.Tiles.ItemPresets;
+using Mundus.Service.Tiles.Mobs.LandMobs;
+using Mundus.Service.Tiles.Mobs;
+using Mundus.Service.Tiles.Items.Presets;
 using Mundus.Service.Tiles.Items;
 
 namespace Mundus.Service.SuperLayers.Generators {
diff --git a/Mundus/Service/SuperLayers/Generators/SkySuperLayerGenerator.cs b/Mundus/Service/SuperLayers/Generators/SkySuperLayerGenerator.cs
index 37a9978..4420d06 100644
--- a/Mundus/Service/SuperLayers/Generators/SkySuperLayerGenerator.cs
+++ b/Mundus/Service/SuperLayers/Generators/SkySuperLayerGenerator.cs
@@ -1,7 +1,7 @@
 using System;
 using Mundus.Data.SuperLayers;
-using Mundus.Service.Tiles;
-using Mundus.Service.Tiles.ItemPresets;
+using Mundus.Service.Tiles.Mobs;
+using Mundus.Service.Tiles.Items.Presets;
 using Mundus.Service.Tiles.Items;
 
 namespace Mundus.Service.SuperLayers.Generators {
diff --git a/Mundus/Service/SuperLayers/Generators/UndergroundSuperLayerGenerator.cs b/Mundus/Service/SuperLayers/Generators/UndergroundSuperLayerGenerator.cs
index cb831ab..31cc38f 100644
--- a/Mundus/Service/SuperLayers/Generators/UndergroundSuperLayerGenerator.cs
+++ b/Mundus/Service/SuperLayers/Generators/UndergroundSuperLayerGenerator.cs
@@ -1,8 +1,7 @@
 using System;
-using Mundus.Data.Superlayers.Mobs;
 using Mundus.Data.SuperLayers;
-using Mundus.Service.Tiles;
-using Mundus.Service.Tiles.ItemPresets;
+using Mundus.Service.Tiles.Mobs;
+using Mundus.Service.Tiles.Items.Presets;
 using Mundus.Service.Tiles.Items;
 
 namespace Mundus.Service.SuperLayers.Generators {
diff --git a/Mundus/Service/SuperLayers/HeightController.cs b/Mundus/Service/SuperLayers/HeightController.cs
index b6d33ba..8a3ab6b 100644
--- a/Mundus/Service/SuperLayers/HeightController.cs
+++ b/Mundus/Service/SuperLayers/HeightController.cs
@@ -1,5 +1,5 @@
 using Mundus.Data.SuperLayers;
-using Mundus.Service.Tiles;
+using Mundus.Service.Tiles.Mobs;
 
 namespace Mundus.Service.SuperLayers {
     public static class HeightController {
diff --git a/Mundus/Service/Crafting/CraftingController.cs b/Mundus/Service/Tiles/Crafting/CraftingController.cs
index a9aee09..61bc897 100644
--- a/Mundus/Service/Crafting/CraftingController.cs
+++ b/Mundus/Service/Tiles/Crafting/CraftingController.cs
@@ -2,10 +2,10 @@
 using System.Linq;
 using Mundus.Data.Crafting;
 using Mundus.Data.Superlayers.Mobs;
-using Mundus.Service.Tiles;
+using Mundus.Service.Tiles.Mobs;
 using Mundus.Service.Tiles.Items;
 
-namespace Mundus.Service.Crafting {
+namespace Mundus.Service.Tiles.Crafting {
     public static class CraftingController {
         private static Dictionary<ItemTile, int> avalableItems;
 
diff --git a/Mundus/Service/Crafting/CraftingRecipe.cs b/Mundus/Service/Tiles/Crafting/CraftingRecipe.cs
index d3829d0..af7ec7e 100644
--- a/Mundus/Service/Crafting/CraftingRecipe.cs
+++ b/Mundus/Service/Tiles/Crafting/CraftingRecipe.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using Mundus.Service.Tiles.Items;
 
-namespace Mundus.Service.Crafting {
+namespace Mundus.Service.Tiles.Crafting {
     public class CraftingRecipe {
         /// <summary>
         /// Item that will be added to the inventory after crafting
diff --git a/Mundus/Service/Tiles/ItemPresets/GroundPresets.cs b/Mundus/Service/Tiles/Items/Presets/GroundPresets.cs
index 76e5d01..5d280eb 100644
--- a/Mundus/Service/Tiles/ItemPresets/GroundPresets.cs
+++ b/Mundus/Service/Tiles/Items/Presets/GroundPresets.cs
@@ -1,8 +1,4 @@
-using System;
-using Mundus.Service.Tiles.Items;
-using Mundus.Service.Tiles.ItemPresets;
-
-namespace Mundus.Service.Tiles.ItemPresets {
+namespace Mundus.Service.Tiles.Items.Presets {
     public static class GroundPresets {
         /// <summary>
         /// Returns a new instance of the sky ground tile
diff --git a/Mundus/Service/Tiles/ItemPresets/MaterialPresets.cs b/Mundus/Service/Tiles/Items/Presets/MaterialPresets.cs
index e55fbf1..24e2597 100644
--- a/Mundus/Service/Tiles/ItemPresets/MaterialPresets.cs
+++ b/Mundus/Service/Tiles/Items/Presets/MaterialPresets.cs
@@ -1,7 +1,4 @@
-using System;
-using Mundus.Service.Tiles.Items;
-
-namespace Mundus.Service.Tiles.ItemPresets {
+namespace Mundus.Service.Tiles.Items.Presets {
     public static class MaterialPresets {
         /// <summary>
         /// Returns a new instance of the land rock material tile
diff --git a/Mundus/Service/Tiles/ItemPresets/StructurePresets.cs b/Mundus/Service/Tiles/Items/Presets/StructurePresets.cs
index 5a9a739..7736005 100644
--- a/Mundus/Service/Tiles/ItemPresets/StructurePresets.cs
+++ b/Mundus/Service/Tiles/Items/Presets/StructurePresets.cs
@@ -1,8 +1,6 @@
-using System;
-using Mundus.Data.Tiles;
-using Mundus.Service.Tiles.Items;
+using Mundus.Data.Tiles;
 
-namespace Mundus.Service.Tiles.ItemPresets {
+namespace Mundus.Service.Tiles.Items.Presets {
     public static class StructurePresets {
         /// <summary>
         /// Returns a new instance of the land boulder structure
diff --git a/Mundus/Service/Tiles/ItemPresets/ToolPresets.cs b/Mundus/Service/Tiles/Items/Presets/ToolPresets.cs
index af9abfe..d18f089 100644
--- a/Mundus/Service/Tiles/ItemPresets/ToolPresets.cs
+++ b/Mundus/Service/Tiles/Items/Presets/ToolPresets.cs
@@ -1,8 +1,6 @@
-using System;
-using Mundus.Data.Tiles;
-using Mundus.Service.Tiles.Items;
+using Mundus.Data.Tiles;
 
-namespace Mundus.Service.Tiles.ItemPresets {
+namespace Mundus.Service.Tiles.Items.Presets {
     public static class ToolPresets {
         public static Tool GetAWoodenPickaxe() {
             return new Tool("wooden_pickaxe", ToolTypes.Pickaxe, 1);
diff --git a/Mundus/Service/SwitchItems.cs b/Mundus/Service/Tiles/Items/SwitchItems.cs
index e44a02b..ef65a62 100644
--- a/Mundus/Service/SwitchItems.cs
+++ b/Mundus/Service/Tiles/Items/SwitchItems.cs
@@ -1,9 +1,7 @@
 using Mundus.Data.Superlayers.Mobs;
 using Mundus.Data.Windows;
-using Mundus.Service.Tiles;
-using Mundus.Service.Tiles.Items;
 
-namespace Mundus.Service {
+namespace Mundus.Service.Tiles.Items {
     public static class SwitchItems {
         private static ItemTile[] origin = null;
         private static int oIndex = -1;
diff --git a/Mundus/Service/Mobs/Controllers/MobFighting.cs b/Mundus/Service/Tiles/Mobs/Controllers/MobFighting.cs
index aa937cd..f5ea123 100644
--- a/Mundus/Service/Mobs/Controllers/MobFighting.cs
+++ b/Mundus/Service/Tiles/Mobs/Controllers/MobFighting.cs
@@ -1,11 +1,10 @@
 using System.Linq;
 using Mundus.Data.Superlayers.Mobs;
 using Mundus.Data.Tiles;
-using Mundus.Service.Mobs.LandMobs;
-using Mundus.Service.Tiles;
 using Mundus.Service.Tiles.Items;
+using Mundus.Service.Tiles.Mobs.LandMobs;
 
-namespace Mundus.Service.Mobs.Controllers {
+namespace Mundus.Service.Tiles.Mobs.Controllers {
     public static class MobFighting {
         /// <summary>
         /// Returns if for the specified position in the superlayer the payer is in, there exists a mob
diff --git a/Mundus/Service/Mobs/Controllers/MobMovement.cs b/Mundus/Service/Tiles/Mobs/Controllers/MobMovement.cs
index a26fc27..1a92e51 100644
--- a/Mundus/Service/Mobs/Controllers/MobMovement.cs
+++ b/Mundus/Service/Tiles/Mobs/Controllers/MobMovement.cs
@@ -2,11 +2,11 @@
 using Mundus.Data;
 using Mundus.Data.Superlayers.Mobs;
 using Mundus.Data.SuperLayers;
-using Mundus.Service.Mobs.LandMobs;
-using Mundus.Service.SuperLayers;
-using Mundus.Service.Tiles;
+using Mundus.Service.SuperLayers;
+using Mundus.Service.Tiles.Mobs;
+using Mundus.Service.Tiles.Mobs.LandMobs;
 
-namespace Mundus.Service.Mobs.Controllers {
+namespace Mundus.Service.Tiles.Mobs.Controllers {
     public static class MobMovement {
         private static Random rnd = new Random();
 
diff --git a/Mundus/Service/Mobs/Controllers/MobStatsController.cs b/Mundus/Service/Tiles/Mobs/Controllers/MobStatsController.cs
index c8f37d1..6a47ca2 100644
--- a/Mundus/Service/Mobs/Controllers/MobStatsController.cs
+++ b/Mundus/Service/Tiles/Mobs/Controllers/MobStatsController.cs
@@ -3,7 +3,7 @@ using Mundus.Data;
 using Mundus.Data.Superlayers.Mobs;
 using Mundus.Service.SuperLayers;
 
-namespace Mundus.Service.Mob.Controllers {
+namespace Mundus.Service.Tiles.Mobs.Controllers {
     public static class MobStatsController {
         public static int GetPlayerHealth() {
             return MI.Player.Health;
diff --git a/Mundus/Service/Mobs/Controllers/MobTerraforming.cs b/Mundus/Service/Tiles/Mobs/Controllers/MobTerraforming.cs
index bbbb15a..fc2ea32 100644
--- a/Mundus/Service/Mobs/Controllers/MobTerraforming.cs
+++ b/Mundus/Service/Tiles/Mobs/Controllers/MobTerraforming.cs
@@ -5,7 +5,7 @@ using Mundus.Data.Tiles;
 using Mundus.Service.SuperLayers;
 using Mundus.Service.Tiles.Items;
 
-namespace Mundus.Service.Mobs.Controllers {
+namespace Mundus.Service.Tiles.Mobs.Controllers {
     public static class MobTerraforming {
         /// <summary>
         /// Tries to place a selected structure/ground tile or to mine/dig (destroy) at the selected location
diff --git a/Mundus/Service/Inventory.cs b/Mundus/Service/Tiles/Mobs/Inventory.cs
index de9c3ac..58e1767 100644
--- a/Mundus/Service/Inventory.cs
+++ b/Mundus/Service/Tiles/Mobs/Inventory.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Linq;
 
-namespace Mundus.Service {
+namespace Mundus.Service.Tiles.Mobs {
     public class Inventory {
         /// <summary>
         /// Has a size of "Screen and Inventory" and can hold Tools, Materials, Structures and Gear
diff --git a/Mundus/Service/Mobs/LandMobs/LandMobsPresets.cs b/Mundus/Service/Tiles/Mobs/LandMobs/LandMobsPresets.cs
index bb3882b..ef4a2d4 100644
--- a/Mundus/Service/Mobs/LandMobs/LandMobsPresets.cs
+++ b/Mundus/Service/Tiles/Mobs/LandMobs/LandMobsPresets.cs
@@ -1,9 +1,7 @@
-using System;
-using Mundus.Data.SuperLayers;
-using Mundus.Service.Tiles;
-using Mundus.Service.Tiles.ItemPresets;
+using Mundus.Data.SuperLayers;
+using Mundus.Service.Tiles.Items.Presets;
 
-namespace Mundus.Service.Mobs.LandMobs {
+namespace Mundus.Service.Tiles.Mobs.LandMobs {
     public static class LandMobsPresets {
         /// <summary>
         /// Returns a new instance of the cow mob tile
diff --git a/Mundus/Service/Mobs/LandMobs/Player.cs b/Mundus/Service/Tiles/Mobs/LandMobs/Player.cs
index d7c8e06..bf102e4 100644
--- a/Mundus/Service/Mobs/LandMobs/Player.cs
+++ b/Mundus/Service/Tiles/Mobs/LandMobs/Player.cs
@@ -1,9 +1,7 @@
-using System.Linq;
-using Mundus.Data.SuperLayers;
-using Mundus.Service.Tiles;
+using Mundus.Data.SuperLayers;
 using Mundus.Service.Tiles.Items;
 
-namespace Mundus.Service.Mobs.LandMobs {
+namespace Mundus.Service.Tiles.Mobs.LandMobs {
     public class Player : MobTile {
         /// <summary>
         /// Note: player has an rndMovementQualifier of -1 and drops first item in the hotbar
diff --git a/Mundus/Service/Mobs/MobTile.cs b/Mundus/Service/Tiles/Mobs/MobTile.cs
index 6167a40..ed2d5fe 100644
--- a/Mundus/Service/Mobs/MobTile.cs
+++ b/Mundus/Service/Tiles/Mobs/MobTile.cs
@@ -1,12 +1,9 @@
-using System;
-using Gtk;
+using Gtk;
 using Mundus.Data;
 using Mundus.Data.SuperLayers;
-using Mundus.Service.Mobs;
-using Mundus.Service.Mobs.Controllers;
 using Mundus.Service.Tiles.Items;
 
-namespace Mundus.Service.Tiles {
+namespace Mundus.Service.Tiles.Mobs {
     public class MobTile : ITile {
         public string stock_id { get; private set; }
         public Image Texture { get; private set; }
diff --git a/Mundus/Views/Windows/CraftingWindow.cs b/Mundus/Views/Windows/CraftingWindow.cs
index 0a087a4..56d9549 100644
--- a/Mundus/Views/Windows/CraftingWindow.cs
+++ b/Mundus/Views/Windows/CraftingWindow.cs
@@ -1,6 +1,6 @@
 using Gtk;
 using System;
-using Mundus.Service.Crafting;
+using Mundus.Service.Tiles.Crafting;
 using Mundus.Service.Tiles.Items;
 
 namespace Mundus.Views.Windows {
diff --git a/Mundus/Views/Windows/IGameWindow.cs b/Mundus/Views/Windows/GameWindows/IGameWindow.cs
index 95f8636..21c329f 100644
--- a/Mundus/Views/Windows/IGameWindow.cs
+++ b/Mundus/Views/Windows/GameWindows/IGameWindow.cs
@@ -1,6 +1,6 @@
 using Mundus.Service.Tiles.Items;
 
-namespace Mundus.Views.Windows {
+namespace Mundus.Views.Windows.GameWindows {
     public interface IGameWindow {
         int Size { get; }
 
diff --git a/Mundus/Views/Windows/LargeGameWindow.cs b/Mundus/Views/Windows/GameWindows/LargeGameWindow.cs
index d010a68..abe4913 100644
--- a/Mundus/Views/Windows/LargeGameWindow.cs
+++ b/Mundus/Views/Windows/GameWindows/LargeGameWindow.cs
@@ -1,12 +1,12 @@
 using System;
 using Gtk;
 using Mundus.Service;
-using Mundus.Service.Mob.Controllers;
-using Mundus.Service.Mobs.Controllers;
+using Mundus.Service.Tiles.Mobs.Controllers;
 using Mundus.Service.SuperLayers;
 using Mundus.Service.Tiles.Items;
+using Mundus.Service.Tiles.Mobs;
 
-namespace Mundus.Views.Windows {
+namespace Mundus.Views.Windows.GameWindows {
     public partial class LargeGameWindow : Gtk.Window, IGameWindow {
         public int Size { get; private set; }
 
diff --git a/Mundus/Views/Windows/MediumGameWindow.cs b/Mundus/Views/Windows/GameWindows/MediumGameWindow.cs
index 623eece..6f52768 100644
--- a/Mundus/Views/Windows/MediumGameWindow.cs
+++ b/Mundus/Views/Windows/GameWindows/MediumGameWindow.cs
@@ -1,12 +1,12 @@
 using System;
 using Gtk;
 using Mundus.Service;
-using Mundus.Service.Mob.Controllers;
-using Mundus.Service.Mobs.Controllers;
+using Mundus.Service.Tiles.Mobs.Controllers;
 using Mundus.Service.SuperLayers;
 using Mundus.Service.Tiles.Items;
+using Mundus.Service.Tiles.Mobs;
 
-namespace Mundus.Views.Windows {
+namespace Mundus.Views.Windows.GameWindows {
     public partial class MediumGameWindow : Gtk.Window, IGameWindow {
         public int Size { get; private set; }
 
diff --git a/Mundus/Views/Windows/SmallGameWindow.cs b/Mundus/Views/Windows/GameWindows/SmallGameWindow.cs
index d57ea30..bf07401 100644
--- a/Mundus/Views/Windows/SmallGameWindow.cs
+++ b/Mundus/Views/Windows/GameWindows/SmallGameWindow.cs
@@ -1,13 +1,12 @@
 using System;
 using Gtk;
 using Mundus.Service;
-using Mundus.Service.Mob.Controllers;
-using Mundus.Service.Mobs;
-using Mundus.Service.Mobs.Controllers;
+using Mundus.Service.Tiles.Mobs.Controllers;
 using Mundus.Service.SuperLayers;
 using Mundus.Service.Tiles.Items;
+using Mundus.Service.Tiles.Mobs;
 
-namespace Mundus.Views.Windows {
+namespace Mundus.Views.Windows.GameWindows {
     public partial class SmallGameWindow : Gtk.Window, IGameWindow {
         /*Value for the height and width of the game screen, map screens and inventory screen
          *and the width of stats, hotbar, accessories, gear & items on the ground menus*/
diff --git a/Mundus/Views/Windows/PauseWindow.cs b/Mundus/Views/Windows/PauseWindow.cs
index b67e27c..7df7717 100644
--- a/Mundus/Views/Windows/PauseWindow.cs
+++ b/Mundus/Views/Windows/PauseWindow.cs
@@ -1,6 +1,7 @@
 using System;
 using Gtk;
 using Mundus.Service;
+using Mundus.Views.Windows.GameWindows;
 
 namespace Mundus.Views.Windows {
     public partial class PauseWindow : Gtk.Window {
diff --git a/Mundus/gtk-gui/Mundus.Views.Windows.LargeGameWindow.cs b/Mundus/gtk-gui/Mundus.Views.Windows.LargeGameWindow.cs
index 3a31e9d..18c246f 100644
--- a/Mundus/gtk-gui/Mundus.Views.Windows.LargeGameWindow.cs
+++ b/Mundus/gtk-gui/Mundus.Views.Windows.LargeGameWindow.cs
@@ -1,6 +1,6 @@
 
 // This file has been generated by the GUI designer. Do not modify.
-namespace Mundus.Views.Windows
+namespace Mundus.Views.Windows.GameWindows
 {
 	public partial class LargeGameWindow
 	{
diff --git a/Mundus/gtk-gui/Mundus.Views.Windows.MediumGameWindow.cs b/Mundus/gtk-gui/Mundus.Views.Windows.MediumGameWindow.cs
index 7dac688..f802514 100644
--- a/Mundus/gtk-gui/Mundus.Views.Windows.MediumGameWindow.cs
+++ b/Mundus/gtk-gui/Mundus.Views.Windows.MediumGameWindow.cs
@@ -1,6 +1,6 @@
 
 // This file has been generated by the GUI designer. Do not modify.
-namespace Mundus.Views.Windows
+namespace Mundus.Views.Windows.GameWindows
 {
 	public partial class MediumGameWindow
 	{
diff --git a/Mundus/gtk-gui/Mundus.Views.Windows.SmallGameWindow.cs b/Mundus/gtk-gui/Mundus.Views.Windows.SmallGameWindow.cs
index 5cb01f0..7cc5178 100644
--- a/Mundus/gtk-gui/Mundus.Views.Windows.SmallGameWindow.cs
+++ b/Mundus/gtk-gui/Mundus.Views.Windows.SmallGameWindow.cs
@@ -1,6 +1,6 @@
 
 // This file has been generated by the GUI designer. Do not modify.
-namespace Mundus.Views.Windows
+namespace Mundus.Views.Windows.GameWindows
 {
 	public partial class SmallGameWindow
 	{