diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/Entities/Entity.cpp b/Entity.cpp
similarity index 98%
rename from Entities/Entity.cpp
rename to Entity.cpp
index f9cb67a..68c45a9 100644
--- a/Entities/Entity.cpp
+++ b/Entity.cpp
@@ -1,5 +1,5 @@
-#include "Entity.h"
-#include "../Environment/Maze.h"
+#include "Entities/Entity.h"
+#include "Maze.h"
 
 namespace game {
     Entity::Entity(const Vector2d starting_position, const char display_character): pos(starting_position), display_character(display_character), move_left(true){}
diff --git a/Entities/Entity.h b/Entity.h
similarity index 98%
rename from Entities/Entity.h
rename to Entity.h
index 157fdcd..04222e6 100644
--- a/Entities/Entity.h
+++ b/Entity.h
@@ -1,4 +1,4 @@
-#include "../Util/Vector2d.h"
+#include "Vector2d.h"
 
 #ifndef ENTITY_H
 #define ENTITY_H
diff --git a/Environment/Game.cpp b/Game.cpp
similarity index 96%
rename from Environment/Game.cpp
rename to Game.cpp
index bb61e71..b28def1 100644
--- a/Environment/Game.cpp
+++ b/Game.cpp
@@ -1,8 +1,8 @@
-#include "Game.h"
-#include "Maze.h"
-#include "../Exceptions/MovementNotPossible.h"
+#include "Environment/Game.h"
+#include "Environment/Maze.h"
+#include "MovementNotPossible.h"
 #include "../Exceptions/UnkownAction.h"
-#include "../Util/Vector2d.h"
+#include "Vector2d.h"
 
 using game::Player;
 using game::Maze;
diff --git a/Environment/Game.h b/Game.h
similarity index 91%
rename from Environment/Game.h
rename to Game.h
index a0b3e4c..399c43b 100644
--- a/Environment/Game.h
+++ b/Game.h
@@ -1,7 +1,7 @@
-#include "Maze.h"
-#include "../Entities/Player.h"
-#include "../Util/GameState.h"
-#include "../Entities/Entity.h"
+#include "Environment/Maze.h"
+#include "Player.h"
+#include "GameState.h"
+#include "Entity.h"
 
 #ifndef GAME_H
 #define GAME_H
diff --git a/Util/GameState.h b/GameState.h
similarity index 100%
rename from Util/GameState.h
rename to GameState.h
diff --git a/Exceptions/MalformedMaze.h b/MalformedMaze.h
similarity index 92%
rename from Exceptions/MalformedMaze.h
rename to MalformedMaze.h
index c31c453..d75a2ac 100644
--- a/Exceptions/MalformedMaze.h
+++ b/MalformedMaze.h
@@ -1,4 +1,4 @@
-#include "../std_lib_inc.h"
+#include "std_lib_inc.h"
 #ifndef MALFORMEDMAZE_H
 #define MALFORMEDMAZE_H
 
diff --git a/Environment/Maze.cpp b/Maze.cpp
similarity index 97%
rename from Environment/Maze.cpp
rename to Maze.cpp
index b341572..f03b2d4 100644
--- a/Environment/Maze.cpp
+++ b/Maze.cpp
@@ -1,7 +1,7 @@
-#include "Maze.h"
-#include "../Entities/Entity.h"
-#include "../Entities/Player.h"
-#include "../Exceptions/MalformedMaze.h"
+#include "Environment/Maze.h"
+#include "Entity.h"
+#include "Entities/Player.h"
+#include "MalformedMaze.h"
 
 using game_exceptions::MalformedMaze;
 namespace game {
diff --git a/Environment/Maze.h b/Maze.h
similarity index 98%
rename from Environment/Maze.h
rename to Maze.h
index a51f934..e5c4151 100644
--- a/Environment/Maze.h
+++ b/Maze.h
@@ -1,8 +1,8 @@
 #ifndef MAZE_H
 #define MAZE_H
 
-#include "../Util/Vector2d.h"
-#include "../std_lib_inc.h"
+#include "Vector2d.h"
+#include "std_lib_inc.h"
 
 namespace game {
     class Player;
diff --git a/Exceptions/MovementNotPossible.h b/MovementNotPossible.h
similarity index 92%
rename from Exceptions/MovementNotPossible.h
rename to MovementNotPossible.h
index 2eff7ff..3c7f34b 100644
--- a/Exceptions/MovementNotPossible.h
+++ b/MovementNotPossible.h
@@ -1,4 +1,4 @@
-#include "../std_lib_inc.h"
+#include "std_lib_inc.h"
 #ifndef MOVEMENTNOTPOSSIBLE_H
 #define MOVEMENTNOTPOSSIBLE_H
 
diff --git a/Entities/Player.cpp b/Player.cpp
similarity index 95%
rename from Entities/Player.cpp
rename to Player.cpp
index c03b22a..fe98ec0 100644
--- a/Entities/Player.cpp
+++ b/Player.cpp
@@ -1,8 +1,8 @@
-#include "Player.h"
+#include "Entities/Player.h"
 #include "../Environment/Maze.h"
-#include "../Exceptions/MovementNotPossible.h"
-#include "../Util/GameState.h"
-#include "../Environment/Game.h"
+#include "MovementNotPossible.h"
+#include "GameState.h"
+#include "Game.h"
 
 using game::GameState;
 using game::Game;
diff --git a/Entities/Player.h b/Player.h
similarity index 98%
rename from Entities/Player.h
rename to Player.h
index 78f1fb9..5e1a6be 100644
--- a/Entities/Player.h
+++ b/Player.h
@@ -1,5 +1,5 @@
 #include "../Util/Vector2d.h"
-#include "../Util/GameState.h"
+#include "GameState.h"
 
 #ifndef PLAYER_H
 #define PLAYER_H
diff --git a/Exceptions/UnkownAction.h b/UnkownAction.h
similarity index 92%
rename from Exceptions/UnkownAction.h
rename to UnkownAction.h
index 216f9e7..d9ac740 100644
--- a/Exceptions/UnkownAction.h
+++ b/UnkownAction.h
@@ -1,4 +1,4 @@
-#include "../std_lib_inc.h"
+#include "std_lib_inc.h"
 #ifndef UNKOWNACTION_H
 #define UNKOWNACTION_H
 
diff --git a/Util/Vector2d.cpp b/Vector2d.cpp
similarity index 97%
rename from Util/Vector2d.cpp
rename to Vector2d.cpp
index 51db2d9..b7ed43a 100644
--- a/Util/Vector2d.cpp
+++ b/Vector2d.cpp
@@ -1,4 +1,4 @@
-#include "Vector2d.h"
+#include "Util/Vector2d.h"
 
 namespace game
 {
diff --git a/Util/Vector2d.h b/Vector2d.h
similarity index 100%
rename from Util/Vector2d.h
rename to Vector2d.h
diff --git a/main.cpp b/main.cpp
index d3191c1..9f65dd8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,7 +1,7 @@
 #include "Environment/Maze.h"
-#include "Environment/Game.h"
-#include "Exceptions/MalformedMaze.h"
-#include "Util/GameState.h"
+#include "Game.h"
+#include "MalformedMaze.h"
+#include "GameState.h"
 
 using game::Maze;
 using game::Game;