diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 89e46d5..a1c4ccb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,6 +12,7 @@ set_property(GLOBAL PROPERTY SFML_INCLUDE_DIR "${SFML_INCLUDE_DIR}")
 
 #Include "Includes" and "Libraries"
 include_directories(${SFML_INCLUDE_DIR})
-target_link_libraries(2P11 ${SFML_LIBRARIES} Model)
+target_link_libraries(2P11 ${SFML_LIBRARIES} Model ConsoleController)
 
 add_subdirectory(./Model)
+add_subdirectory(./Controller/)
diff --git a/src/Controller/CMakeLists.txt b/src/Controller/CMakeLists.txt
new file mode 100644
index 0000000..7ebeb19
--- /dev/null
+++ b/src/Controller/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(./ConsoleController/)
diff --git a/src/Controller/ConsoleController/CMakeLists.txt b/src/Controller/ConsoleController/CMakeLists.txt
new file mode 100644
index 0000000..d42803f
--- /dev/null
+++ b/src/Controller/ConsoleController/CMakeLists.txt
@@ -0,0 +1,3 @@
+#Make Model lib
+add_library(ConsoleController ./ConsoleController.cpp)
+target_link_libraries(ConsoleController Model)
diff --git a/src/Controller/ConsoleController/ConsoleController.cpp b/src/Controller/ConsoleController/ConsoleController.cpp
index 2231213..dc61ae8 100644
--- a/src/Controller/ConsoleController/ConsoleController.cpp
+++ b/src/Controller/ConsoleController/ConsoleController.cpp
@@ -1,4 +1,4 @@
-#include "ConsoleController.hpp"
+#include "./ConsoleController.hpp"
 
 ConsoleController::ConsoleController()
 {
diff --git a/src/Model/Game.hpp b/src/Model/Game.hpp
index 8dcaf64..b7e0a60 100644
--- a/src/Model/Game.hpp
+++ b/src/Model/Game.hpp
@@ -8,6 +8,7 @@
  * Date : 29/04/2015 */
 
 #include <iostream>
+#include <cstdlib>
 
 #include "Grid.hpp"
 
@@ -26,4 +27,4 @@ class Game
         bool isOver();
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Model/Grid.cpp b/src/Model/Grid.cpp
index 295b9b4..ca93955 100644
--- a/src/Model/Grid.cpp
+++ b/src/Model/Grid.cpp
@@ -75,17 +75,17 @@ void Grid::move(Direction direction)
 {
     switch (direction)
     {
-        case Direction::UP:
+        case UP:
             
             break;
         
-        case Direction::DOWN:
+        case DOWN:
             break;
             
-        case Direction::LEFT:
+        case LEFT:
             break;
             
-        case Direction::RIGHT:
+        case RIGHT:
             break;
             
         default: