diff --git a/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml b/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml
index 579fe2a..0e2c1f4 100644
--- a/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml
+++ b/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml
@@ -11,8 +11,16 @@
         <e p="ISimRunner.cs" t="Include" />
         <e p="IUserConsole.cs" t="Include" />
         <e p="Maps" t="Include">
+          <e p="HexCell.cs" t="Include" />
+          <e p="HexMap.cs" t="Include" />
+          <e p="IHexCell.cs" t="Include" />
+          <e p="IHexMap.cs" t="Include" />
           <e p="IMapFactory.cs" t="Include" />
+          <e p="ISquareCell.cs" t="Include" />
+          <e p="ISquareMap.cs" t="Include" />
           <e p="MapFactory.cs" t="Include" />
+          <e p="SquareCell.cs" t="Include" />
+          <e p="SquareMap.cs" t="Include" />
         </e>
         <e p="Module.cs" t="Include" />
         <e p="obj" t="ExcludeRecursive">
diff --git a/.idea/.idea.RobotIntelFinal/.idea/workspace.xml b/.idea/.idea.RobotIntelFinal/.idea/workspace.xml
index b46b6d1..11b2854 100644
--- a/.idea/.idea.RobotIntelFinal/.idea/workspace.xml
+++ b/.idea/.idea.RobotIntelFinal/.idea/workspace.xml
@@ -15,25 +15,22 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="dafcaeb7-80aa-43a3-a480-786fafb78c0b" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/ConsoleApp/Bootstrapper.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ConsoleApp/ISimRunner.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ConsoleApp/IUserConsole.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ConsoleApp/Maps/IMapFactory.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ConsoleApp/Maps/MapFactory.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ConsoleApp/Module.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ConsoleApp/SimRunner.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ConsoleApp/UserConsole.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ConsoleApp/Maps/HexCell.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ConsoleApp/Maps/HexMap.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ConsoleApp/Maps/IHexCell.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ConsoleApp/Maps/IHexMap.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ConsoleApp/Maps/ISquareCell.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ConsoleApp/Maps/ISquareMap.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ConsoleApp/Maps/SquareCell.cs" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ConsoleApp/Maps/SquareMap.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/contentModel.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.RobotIntelFinal/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ConsoleApp/CoreModule.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/CoreModule.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ConsoleApp/Bootstrapper.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Bootstrapper.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ConsoleApp/ISimRunner.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/ISimRunner.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/IMapFactory.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Maps/IMapFactory.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ConsoleApp/Maps/MapFactory.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Maps/MapFactory.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ConsoleApp/Program.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/Program.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Simulator/Networking/INetworkInterface.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Simulator/Networking/INetworkInterfaceFactory.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Simulator/Networking/NetworkInterface.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Simulator/Networking/NetworkInterfaceFactory.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Simulator/Networking/SimulatorModule.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Simulator/Program.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Simulator/Simulator.csproj" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ConsoleApp/SimRunner.cs" beforeDir="false" afterPath="$PROJECT_DIR$/ConsoleApp/SimRunner.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -62,11 +59,21 @@
         <option value="$PROJECT_DIR$/ConsoleApp/CoreModule.cs" />
         <option value="$PROJECT_DIR$/ConsoleApp/MapFactory.cs" />
         <option value="$PROJECT_DIR$/ConsoleApp/UserConsole.cs" />
-        <option value="$PROJECT_DIR$/ConsoleApp/Program.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/IMapFactory.cs" />
         <option value="$PROJECT_DIR$/ConsoleApp/Bootstrapper.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/Maps/IMapFactory.cs" />
         <option value="$PROJECT_DIR$/ConsoleApp/ISimRunner.cs" />
         <option value="$PROJECT_DIR$/ConsoleApp/SimRunner.cs" />
-        <option value="$PROJECT_DIR$/ConsoleApp/IMapFactory.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/Program.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/Maps/MapFactory.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/Maps/SquareMap.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/Maps/HexMap.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/Maps/IHexMap.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/Maps/ISquareMap.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/Maps/HexCell.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/Maps/IHexCell.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/Maps/SquareCell.cs" />
+        <option value="$PROJECT_DIR$/ConsoleApp/Maps/ISquareCell.cs" />
       </list>
     </option>
   </component>
@@ -175,10 +182,10 @@
     </state>
     <state x="1640" y="-86" key="Rider.ProjectTemplateDialog.Size/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607286605974" />
     <state x="1640" y="-86" key="Rider.ProjectTemplateDialog.Size/0.25.1440.798/2640.-757.1200.1895/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607287214952" />
-    <state x="1860" y="-144" key="RiderGenerateDialog" timestamp="1607635610011">
+    <state x="1860" y="-144" key="RiderGenerateDialog" timestamp="1607636510472">
       <screen x="1440" y="-782" width="1200" height="1920" />
     </state>
-    <state x="1860" y="-144" key="RiderGenerateDialog/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607635610011" />
+    <state x="1860" y="-144" key="RiderGenerateDialog/0.0.1440.900/2640.-782.1200.1920/1440.-782.1200.1920@1440.-782.1200.1920" timestamp="1607636510472" />
     <state x="1703" y="-333" width="672" height="678" key="search.everywhere.popup" timestamp="1607633696072">
       <screen x="1440" y="-782" width="1200" height="1920" />
     </state>
diff --git a/ConsoleApp/Maps/HexMap.cs b/ConsoleApp/Maps/HexMap.cs
index d418b3a..0f24d36 100644
--- a/ConsoleApp/Maps/HexMap.cs
+++ b/ConsoleApp/Maps/HexMap.cs
@@ -1,4 +1,4 @@
-namespace ConsoleApp
+namespace ConsoleApp.Maps
 {
     public class HexMap
     {
diff --git a/ConsoleApp/Maps/IHexCell.cs b/ConsoleApp/Maps/IHexCell.cs
index c7a9386..b4a8d99 100644
--- a/ConsoleApp/Maps/IHexCell.cs
+++ b/ConsoleApp/Maps/IHexCell.cs
@@ -1,4 +1,4 @@
-namespace ConsoleApp
+namespace ConsoleApp.Maps
 {
     public interface IHexCell
     {
diff --git a/ConsoleApp/Maps/IHexMap.cs b/ConsoleApp/Maps/IHexMap.cs
index d053d8a..e183efe 100644
--- a/ConsoleApp/Maps/IHexMap.cs
+++ b/ConsoleApp/Maps/IHexMap.cs
@@ -1,4 +1,4 @@
-namespace ConsoleApp
+namespace ConsoleApp.Maps
 {
     public interface IHexMap
     {
diff --git a/ConsoleApp/Maps/IMapFactory.cs b/ConsoleApp/Maps/IMapFactory.cs
index 6a81691..6630a5b 100644
--- a/ConsoleApp/Maps/IMapFactory.cs
+++ b/ConsoleApp/Maps/IMapFactory.cs
@@ -1,6 +1,6 @@
 using System.Dynamic;
 
-namespace ConsoleApp
+namespace ConsoleApp.Maps
 {
     public interface IMapFactory
     {
diff --git a/ConsoleApp/Maps/ISquareCell.cs b/ConsoleApp/Maps/ISquareCell.cs
index 71edc59..7b118a5 100644
--- a/ConsoleApp/Maps/ISquareCell.cs
+++ b/ConsoleApp/Maps/ISquareCell.cs
@@ -1,4 +1,4 @@
-namespace ConsoleApp
+namespace ConsoleApp.Maps
 {
     public interface ISquareCell
     {
diff --git a/ConsoleApp/Maps/ISquareMap.cs b/ConsoleApp/Maps/ISquareMap.cs
index 01f3fc7..494a3b5 100644
--- a/ConsoleApp/Maps/ISquareMap.cs
+++ b/ConsoleApp/Maps/ISquareMap.cs
@@ -1,4 +1,4 @@
-namespace ConsoleApp
+namespace ConsoleApp.Maps
 {
     public interface ISquareMap
     {
diff --git a/ConsoleApp/Maps/MapFactory.cs b/ConsoleApp/Maps/MapFactory.cs
index 773f67f..2ca6254 100644
--- a/ConsoleApp/Maps/MapFactory.cs
+++ b/ConsoleApp/Maps/MapFactory.cs
@@ -1,4 +1,4 @@
-namespace ConsoleApp
+namespace ConsoleApp.Maps
 {
     public class MapFactory : IMapFactory
     {
diff --git a/ConsoleApp/Maps/SquareCell.cs b/ConsoleApp/Maps/SquareCell.cs
index 5adb1b1..051bb42 100644
--- a/ConsoleApp/Maps/SquareCell.cs
+++ b/ConsoleApp/Maps/SquareCell.cs
@@ -1,4 +1,4 @@
-namespace ConsoleApp
+namespace ConsoleApp.Maps
 {
     public class SquareCell
     {
diff --git a/ConsoleApp/Maps/SquareMap.cs b/ConsoleApp/Maps/SquareMap.cs
index 08e5ee4..90511c3 100644
--- a/ConsoleApp/Maps/SquareMap.cs
+++ b/ConsoleApp/Maps/SquareMap.cs
@@ -1,4 +1,4 @@
-namespace ConsoleApp
+namespace ConsoleApp.Maps
 {
     public class SquareMap
     {
diff --git a/ConsoleApp/Program.cs b/ConsoleApp/Program.cs
index 300bcee..6fb7869 100644
--- a/ConsoleApp/Program.cs
+++ b/ConsoleApp/Program.cs
@@ -1,4 +1,5 @@
 using System;
+using ConsoleApp.Maps;
 
 namespace ConsoleApp
 {
diff --git a/ConsoleApp/SimRunner.cs b/ConsoleApp/SimRunner.cs
index 45727e7..3821e78 100644
--- a/ConsoleApp/SimRunner.cs
+++ b/ConsoleApp/SimRunner.cs
@@ -1,3 +1,5 @@
+using ConsoleApp.Maps;
+
 namespace ConsoleApp
 {
     public class SimRunner : ISimRunner
diff --git a/ConsoleApp/UserConsole.cs b/ConsoleApp/UserConsole.cs
index a47f475..9f824d3 100644
--- a/ConsoleApp/UserConsole.cs
+++ b/ConsoleApp/UserConsole.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using ConsoleApp.Maps;
 
 namespace ConsoleApp
 {