diff --git a/.vs/Pacman_refactored/DesignTimeBuild/.dtbcache.v2 b/.vs/Pacman_refactored/DesignTimeBuild/.dtbcache.v2
index df7bcd2..0df472b 100644
Binary files a/.vs/Pacman_refactored/DesignTimeBuild/.dtbcache.v2 and b/.vs/Pacman_refactored/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/.vs/Pacman_refactored/FileContentIndex/32e5de2b-6bfa-4cac-afcf-39657c3fd7ac.vsidx b/.vs/Pacman_refactored/FileContentIndex/32e5de2b-6bfa-4cac-afcf-39657c3fd7ac.vsidx
new file mode 100644
index 0000000..673a4d2
Binary files /dev/null and b/.vs/Pacman_refactored/FileContentIndex/32e5de2b-6bfa-4cac-afcf-39657c3fd7ac.vsidx differ
diff --git a/.vs/Pacman_refactored/FileContentIndex/60d0fa7c-865f-4b5f-819b-b7509af360d8.vsidx b/.vs/Pacman_refactored/FileContentIndex/60d0fa7c-865f-4b5f-819b-b7509af360d8.vsidx
new file mode 100644
index 0000000..f637697
Binary files /dev/null and b/.vs/Pacman_refactored/FileContentIndex/60d0fa7c-865f-4b5f-819b-b7509af360d8.vsidx differ
diff --git a/.vs/Pacman_refactored/FileContentIndex/6a581469-f15f-410f-aadf-c08e160a90be.vsidx b/.vs/Pacman_refactored/FileContentIndex/6a581469-f15f-410f-aadf-c08e160a90be.vsidx
new file mode 100644
index 0000000..26eeaa7
Binary files /dev/null and b/.vs/Pacman_refactored/FileContentIndex/6a581469-f15f-410f-aadf-c08e160a90be.vsidx differ
diff --git a/.vs/Pacman_refactored/FileContentIndex/6c86b29b-1667-4658-88a9-cd053ef2048e.vsidx b/.vs/Pacman_refactored/FileContentIndex/6c86b29b-1667-4658-88a9-cd053ef2048e.vsidx
deleted file mode 100644
index 272b25c..0000000
Binary files a/.vs/Pacman_refactored/FileContentIndex/6c86b29b-1667-4658-88a9-cd053ef2048e.vsidx and /dev/null differ
diff --git a/.vs/Pacman_refactored/FileContentIndex/8e1708e0-c46b-4552-8868-83dd3e3098e2.vsidx b/.vs/Pacman_refactored/FileContentIndex/8e1708e0-c46b-4552-8868-83dd3e3098e2.vsidx
new file mode 100644
index 0000000..83913da
Binary files /dev/null and b/.vs/Pacman_refactored/FileContentIndex/8e1708e0-c46b-4552-8868-83dd3e3098e2.vsidx differ
diff --git a/.vs/Pacman_refactored/FileContentIndex/8fda3046-d39d-47af-b675-58c6183dc8a3.vsidx b/.vs/Pacman_refactored/FileContentIndex/8fda3046-d39d-47af-b675-58c6183dc8a3.vsidx
deleted file mode 100644
index 18e8152..0000000
Binary files a/.vs/Pacman_refactored/FileContentIndex/8fda3046-d39d-47af-b675-58c6183dc8a3.vsidx and /dev/null differ
diff --git a/.vs/Pacman_refactored/FileContentIndex/96aa0821-567a-4eee-9f85-c1a068561e42.vsidx b/.vs/Pacman_refactored/FileContentIndex/96aa0821-567a-4eee-9f85-c1a068561e42.vsidx
deleted file mode 100644
index 1d6a753..0000000
Binary files a/.vs/Pacman_refactored/FileContentIndex/96aa0821-567a-4eee-9f85-c1a068561e42.vsidx and /dev/null differ
diff --git a/.vs/Pacman_refactored/FileContentIndex/be9918f1-871f-4ff7-93bb-b8ca9047ff8f.vsidx b/.vs/Pacman_refactored/FileContentIndex/be9918f1-871f-4ff7-93bb-b8ca9047ff8f.vsidx
deleted file mode 100644
index 1b80e18..0000000
Binary files a/.vs/Pacman_refactored/FileContentIndex/be9918f1-871f-4ff7-93bb-b8ca9047ff8f.vsidx and /dev/null differ
diff --git a/.vs/Pacman_refactored/v17/.suo b/.vs/Pacman_refactored/v17/.suo
index 7fdbc40..66317b9 100644
Binary files a/.vs/Pacman_refactored/v17/.suo and b/.vs/Pacman_refactored/v17/.suo differ
diff --git a/.vs/ProjectEvaluation/pacman_refactored.metadata.v3 b/.vs/ProjectEvaluation/pacman_refactored.metadata.v3
index ac5f079..c2786ef 100644
Binary files a/.vs/ProjectEvaluation/pacman_refactored.metadata.v3 and b/.vs/ProjectEvaluation/pacman_refactored.metadata.v3 differ
diff --git a/.vs/ProjectEvaluation/pacman_refactored.projects.v3 b/.vs/ProjectEvaluation/pacman_refactored.projects.v3
index f34ab51..aa22996 100644
Binary files a/.vs/ProjectEvaluation/pacman_refactored.projects.v3 and b/.vs/ProjectEvaluation/pacman_refactored.projects.v3 differ
diff --git a/Pacman_refactored/Classes/GameObjects/Entity/Entity.cs b/Pacman_refactored/Classes/GameObjects/Entity/Entity.cs
index eb93dc0..0936580 100644
--- a/Pacman_refactored/Classes/GameObjects/Entity/Entity.cs
+++ b/Pacman_refactored/Classes/GameObjects/Entity/Entity.cs
@@ -5,7 +5,7 @@ using Microsoft.Xna.Framework.Input;
 using Pacman_refactored.Interfaces;
 using Pacman_refactored.Enums;
 
-namespace Pacman_refactored.Classes.Entity
+namespace Pacman_refactored.Classes.GameObjects.Entity
 {
     public abstract class Entity : IMovable, IRotatable, IAnimate
     {
diff --git a/Pacman_refactored/Classes/GameObjects/Entity/Ghost.cs b/Pacman_refactored/Classes/GameObjects/Entity/Ghost.cs
index 7458cb0..c5b7ff9 100644
--- a/Pacman_refactored/Classes/GameObjects/Entity/Ghost.cs
+++ b/Pacman_refactored/Classes/GameObjects/Entity/Ghost.cs
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework.Graphics;
 using Pacman_refactored.Interfaces;
 using Pacman_refactored.Enums;
 
-namespace Pacman_refactored.Classes.Entity
+namespace Pacman_refactored.Classes.GameObjects.Entity
 {
     public class Ghost : Entity, IAnimate, IMovable
     {
diff --git a/Pacman_refactored/Classes/GameObjects/Entity/Pacman.cs b/Pacman_refactored/Classes/GameObjects/Entity/Pacman.cs
index ecc1967..0be755d 100644
--- a/Pacman_refactored/Classes/GameObjects/Entity/Pacman.cs
+++ b/Pacman_refactored/Classes/GameObjects/Entity/Pacman.cs
@@ -5,7 +5,7 @@ using Microsoft.Xna.Framework.Input;
 using Pacman_refactored.Interfaces;
 using Pacman_refactored.Enums;
 
-namespace Pacman_refactored.Classes.Entity
+namespace Pacman_refactored.Classes.GameObjects.Entity
 {
     public class Pacman : Entity, IMovable, IRotatable, IAnimate, IControl
     {
diff --git a/Pacman_refactored/Classes/GameObjects/Food/Dot.cs b/Pacman_refactored/Classes/GameObjects/Food/Dot.cs
index aee19ea..675ca05 100644
--- a/Pacman_refactored/Classes/GameObjects/Food/Dot.cs
+++ b/Pacman_refactored/Classes/GameObjects/Food/Dot.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Pacman_refactored.Classes.Food
+namespace Pacman_refactored.Classes.GameObjects.Food
 {
     public class Dot : Food
     {
diff --git a/Pacman_refactored/Classes/GameObjects/Food/Energizer.cs b/Pacman_refactored/Classes/GameObjects/Food/Energizer.cs
index a7397ca..a4b7edf 100644
--- a/Pacman_refactored/Classes/GameObjects/Food/Energizer.cs
+++ b/Pacman_refactored/Classes/GameObjects/Food/Energizer.cs
@@ -3,7 +3,7 @@ using Microsoft.Xna.Framework.Graphics;
 
 using Pacman_refactored.Interfaces;
 
-namespace Pacman_refactored.Classes.Food
+namespace Pacman_refactored.Classes.GameObjects.Food
 {
     public class Energizer : Food, IAnimate
     {
diff --git a/Pacman_refactored/Classes/GameObjects/Food/Food.cs b/Pacman_refactored/Classes/GameObjects/Food/Food.cs
index 930de7a..ab33f0c 100644
--- a/Pacman_refactored/Classes/GameObjects/Food/Food.cs
+++ b/Pacman_refactored/Classes/GameObjects/Food/Food.cs
@@ -1,7 +1,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace Pacman_refactored.Classes.Food
+namespace Pacman_refactored.Classes.GameObjects.Food
 {
     public abstract class Food
     {
diff --git a/Pacman_refactored/Classes/GameObjects/Food/Fruit.cs b/Pacman_refactored/Classes/GameObjects/Food/Fruit.cs
index 862bd6f..077c72c 100644
--- a/Pacman_refactored/Classes/GameObjects/Food/Fruit.cs
+++ b/Pacman_refactored/Classes/GameObjects/Food/Fruit.cs
@@ -1,7 +1,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace Pacman_refactored.Classes.Food
+namespace Pacman_refactored.Classes.GameObjects.Food
 {
     public class Fruit : Food
     {
diff --git a/Pacman_refactored/Game1.cs b/Pacman_refactored/Game1.cs
index ca7faa9..4dc1112 100644
--- a/Pacman_refactored/Game1.cs
+++ b/Pacman_refactored/Game1.cs
@@ -2,12 +2,11 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 using System.Collections.Generic;
-
-using Pacman_refactored.Classes;
 using Pacman_refactored.Enums;
-using Pacman_refactored.Classes.Entity;
+using Pacman_refactored.Classes.GameObjects.Entity;
 using Pacman_refactored.Classes.UI;
-using Pacman_refactored.Classes.Food;
+using Pacman_refactored.Classes.GameObjects.Food;
+using Pacman_refactored.Classes.GameObjects;
 
 namespace Pacman_refactored
 {
diff --git a/Pacman_refactored/Interfaces/IMovable.cs b/Pacman_refactored/Interfaces/IMovable.cs
index 09ccc73..0b130cb 100644
--- a/Pacman_refactored/Interfaces/IMovable.cs
+++ b/Pacman_refactored/Interfaces/IMovable.cs
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework.Input;
 using System.Collections.Generic;
 
 using Pacman_refactored.Enums;
-using Pacman_refactored.Classes;
+using Pacman_refactored.Classes.GameObjects;
 
 namespace Pacman_refactored.Interfaces
 {