25 files changed, 320 insertions, 141 deletions

diff --git a/src/esieequest/controller/Interpreter.java b/src/esieequest/controller/Interpreter.java
index 586b329..8d0f703 100644
--- a/src/esieequest/controller/Interpreter.java
+++ b/src/esieequest/controller/Interpreter.java
@@ -1,7 +1,7 @@
 package esieequest.controller;
 
 import esieequest.model.Game;
-import esieequest.model.command.Command;
+import esieequest.model.commands.Command;
 import esieequest.view.View;
 
 /**
@@ -72,6 +72,12 @@ class Interpreter {
                         case "eat":
                                 this.performer.eat();
                                 return;
+                        case "take":
+                                this.performer.take(command.getOption());
+                                return;
+                        case "drop":
+                                this.performer.drop(command.getOption());
+                                return;
                         case "help":
                                 this.performer.showHelp();
                                 return;
@@ -83,4 +89,5 @@ class Interpreter {
                 this.performer.echo("Unknown command.");
                 return;
         }
+
 }
diff --git a/src/esieequest/controller/Parser.java b/src/esieequest/controller/Parser.java
index 0f97fd1..452c27c 100644
--- a/src/esieequest/controller/Parser.java
+++ b/src/esieequest/controller/Parser.java
@@ -1,6 +1,6 @@
 package esieequest.controller;
 
-import esieequest.model.command.Command;
+import esieequest.model.commands.Command;
 
 /**
  * The command parser.
diff --git a/src/esieequest/controller/Performer.java b/src/esieequest/controller/Performer.java
index 96a95df..1abc887 100644
--- a/src/esieequest/controller/Performer.java
+++ b/src/esieequest/controller/Performer.java
@@ -1,7 +1,8 @@
 package esieequest.controller;
 
 import esieequest.model.Game;
-import esieequest.model.Room;
+import esieequest.model.items.Inventory;
+import esieequest.model.map.Room;
 import esieequest.view.View;
 
 /**
@@ -130,4 +131,42 @@ class Performer {
                 this.echo(this.game.getEatMessage());
         }
 
+        /**
+         * Moves an item from the current Room to the Player's inventory.
+         * 
+         * @param itemName
+         *            the item's name
+         */
+        public void take(final String itemName) {
+                this.moveItem(this.game.getPlayer().getCurrentRoom(), this.game.getPlayer(), itemName);
+        }
+
+        /**
+         * Moves an item from the Player's inventory to the current Room.
+         * 
+         * @param itemName
+         *            the item's name
+         */
+        public void drop(final String itemName) {
+                this.moveItem(this.game.getPlayer(), this.game.getPlayer().getCurrentRoom(), itemName);
+        }
+
+        /**
+         * Moves a given item referred by its name from an inventory to another.
+         * 
+         * @param source
+         *            the source inventory
+         * @param dest
+         *            the destination inventory
+         * @param itemName
+         *            the item's name
+         */
+        private void moveItem(final Inventory source, final Inventory dest, final String itemName) {
+                if (!source.hasItem(itemName)) {
+                        this.echo("No such item.");
+                        return;
+                }
+                dest.putItem(itemName, source.takeItem(itemName));
+        }
+
 }
diff --git a/src/esieequest/controller/Utils.java b/src/esieequest/controller/Utils.java
new file mode 100644
index 0000000..139798c
--- /dev/null
+++ b/src/esieequest/controller/Utils.java
@@ -0,0 +1,40 @@
+package esieequest.controller;
+
+import java.util.Set;
+
+public class Utils {
+
+        /**
+         * 
+         * @param elements
+         *            the elements
+         * @param prefix
+         *            the prefix of the list
+         * @param emptyText
+         *            the text that will be returned if the Set is empty
+         * @return the list
+         */
+        public static String list(final Set<String> elements, final String prefix, final String emptyText) {
+                if (!elements.isEmpty()) {
+                        return prefix + Utils.buildListString(elements) + ".";
+                }
+                return emptyText;
+        }
+
+        /**
+         * Builds a list in the form of a String from a given Set.
+         * 
+         * @param elements
+         *            the Set of Strings
+         * 
+         * @return the list
+         */
+        private static String buildListString(final Set<String> elements) {
+                final StringBuilder list = new StringBuilder();
+                for (final String string : elements) {
+                        list.append(" ").append(string);
+                }
+                return list.toString();
+        }
+
+}
diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 0a9aa01..5ef4c22 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -2,6 +2,10 @@ package esieequest.model;
 
 import java.util.HashMap;
 
+import esieequest.model.entities.Player;
+import esieequest.model.items.Item;
+import esieequest.model.map.Room;
+
 /**
  * Represents the game.
  * 
@@ -187,8 +191,8 @@ public class Game {
          * Creates and adds items into rooms.
          */
         private void createItems() {
-                this.rooms.get("Cafeteria").addItem("Banana", new Item("A yellow banana", 12));
-                this.rooms.get("Cafeteria").addItem("Orange", new Item("An orange orange", 15));
+                this.rooms.get("Cafeteria").putItem("banana", new Item("A yellow banana", 12));
+                this.rooms.get("Cafeteria").putItem("orange", new Item("An orange orange", 15));
         }
 
         /**
diff --git a/src/esieequest/model/Player.java b/src/esieequest/model/Player.java
deleted file mode 100644
index e28edaf..0000000
--- a/src/esieequest/model/Player.java
+++ /dev/null
@@ -1,44 +0,0 @@
-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.
-         *