6 files changed, 87 insertions, 59 deletions

diff --git a/src/esieequest/controller/Performer.java b/src/esieequest/controller/Performer.java
index 27cbf14..96a95df 100644
--- a/src/esieequest/controller/Performer.java
+++ b/src/esieequest/controller/Performer.java
@@ -99,10 +99,10 @@ class Performer {
          *            the direction of the new room
          */
         public void goTo(final String direction) {
-                final Room nextRoom = this.game.getRoomExit(direction);
+                final Room nextRoom = this.game.getPlayer().getCurrentRoom().getExit(direction);
                 if (nextRoom != null) {
-                        this.game.goToRoom(nextRoom);
-                        this.view.updateRoom(this.game.getCurrentRoom());
+                        this.game.getPlayer().goToRoom(nextRoom);
+                        this.view.updateRoom(this.game.getPlayer().getCurrentRoom());
                 } else {
                         this.echo(this.game.getNoExitMessage());
                 }
@@ -112,15 +112,15 @@ class Performer {
          * Changes the current room to the previous one.
          */
         public void goBack() {
-                this.game.goToPreviousRoom();
-                this.view.updateRoom(this.game.getCurrentRoom());
+                this.game.getPlayer().goToPreviousRoom();
+                this.view.updateRoom(this.game.getPlayer().getCurrentRoom());
         }
 
         /**
          * Displays informations about the current place.
          */
         public void look() {
-                this.echo(this.game.getCurrentRoom().getInformations());
+                this.echo(this.game.getPlayer().getCurrentRoom().getInformations());
         }
 
         /**
diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 62dfc94..0a9aa01 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -1,7 +1,6 @@
 package esieequest.model;
 
 import java.util.HashMap;
-import java.util.Stack;
 
 /**
  * Represents the game.
@@ -12,17 +11,16 @@ import java.util.Stack;
 public class Game {
 
         private final HashMap<String, Room> rooms;
-        private Room currentRoom;
 
-        private final Stack<Room> previousRooms;
+        private final Player player;
 
         /**
          * The default constructor.
          */
         public Game() {
                 this.rooms = new HashMap<String, Room>();
-                this.currentRoom = null;
-                this.previousRooms = new Stack<Room>();
+
+                this.player = new Player();
 
                 this.createRooms();
                 this.linkRooms();
@@ -31,6 +29,15 @@ public class Game {
         }
 
         /**
+         * Returns the player
+         * 
+         * @return the player
+         */
+        public Player getPlayer() {
+                return this.player;
+        }
+
+        /**
          * Creates a new room.
          * 
          * @param name
@@ -185,54 +192,13 @@ public class Game {
         }
 
         /**
-         * Sets the current room and stacks previous rooms.
-         * 
-         * @param room
-         *            the destination room
-         */
-        public void goToRoom(final Room room) {
-                this.previousRooms.push(this.currentRoom);
-                this.currentRoom = room;
-        }
-
-        /**
          * Sets the current room designated by its name.
          * 
          * @param roomName
          *            the destination room name
          */
         public void goToRoom(final String roomName) {
-                this.currentRoom = this.rooms.get(roomName);
-        }
-
-        /**
-         * Sets the current room to the previous room.
-         */
-        public void goToPreviousRoom() {
-                if (!this.previousRooms.empty()) {
-                        this.currentRoom = this.previousRooms.pop();
-                }
-        }
-
-        /**
-         * Returns the current room.
-         * 
-         * @return the current room
-         */
-        public Room getCurrentRoom() {
-                return this.currentRoom;
-        }
-
-        /**
-         * Returns the current room's exit located in the given direction.
-         * 
-         * @param direction
-         *            the direction of the exit
-         * 
-         * @return the exit room
-         */
-        public Room getRoomExit(final String direction) {
-                return this.currentRoom.getExit(direction);
+                this.player.goToRoom(this.rooms.get(roomName));
         }
 
         /**
diff --git a/src/esieequest/model/Player.java b/src/esieequest/model/Player.java
index 0252da3..e28edaf 100644
--- a/src/esieequest/model/Player.java
+++ b/src/esieequest/model/Player.java
@@ -1,5 +1,44 @@
 package esieequest.model;
 
+import java.util.Stack;
+
 public class Player {
 
+        private Room currentRoom;
+        private final Stack<Room> previousRooms;
+
+        public Player() {
+                this.currentRoom = null;
+                this.previousRooms = new Stack<Room>();
+        }
+
+        /**
+         * Returns the current room.
+         * 
+         * @return the current room
+         */
+        public Room getCurrentRoom() {
+                return this.currentRoom;
+        }
+
+        /**
+         * Sets the current room and stacks previous rooms.
+         * 
+         * @param room
+         *            the destination room
+         */
+        public void goToRoom(final Room room) {
+                this.previousRooms.push(this.currentRoom);
+                this.currentRoom = room;
+        }
+
+        /**
+         * Sets the current room to the previous room.
+         */
+        public void goToPreviousRoom() {
+                if (!this.previousRooms.empty()) {
+                        this.currentRoom = this.previousRooms.pop();
+                }
+        }
+
 }
diff --git a/src/esieequest/view/text/Console.java b/src/esieequest/view/text/Console.java
index e7a71dd..455db81 100644
--- a/src/esieequest/view/text/Console.java
+++ b/src/esieequest/view/text/Console.java
@@ -15,9 +15,9 @@ public class Console extends TextInterface {
         @Override
         protected void run() {
                 final Scanner scanner = new Scanner(System.in);
-                while (this.running) {
+                while (this.isRunning()) {
                         System.out.print("> ");
-                        this.gameEngine.interpret(scanner.nextLine());
+                        this.getController().interpret(scanner.nextLine());
                 }
                 scanner.close();
         }
diff --git a/src/esieequest/view/text/FileReader.java b/src/esieequest/view/text/FileReader.java
index 392a691..11ee895 100644
--- a/src/esieequest/view/text/FileReader.java
+++ b/src/esieequest/view/text/FileReader.java
@@ -31,11 +31,11 @@ public class FileReader extends TextInterface {
         protected void run() {