Reorganise packages

80 files changed, 330 insertions, 330 deletions

diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index f8b013f..c755741 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -5,12 +5,12 @@ import java.util.List;
 
 import javax.swing.JApplet;
 
-import esieequest.controller.GameEngine;
-import esieequest.view.Viewable;
-import esieequest.view.app.Applet;
-import esieequest.view.app.Window;
-import esieequest.view.text.Console;
-import esieequest.view.text.FileReader;
+import esieequest.engine.GameEngine;
+import esieequest.ui.Viewable;
+import esieequest.ui.rich.Applet;
+import esieequest.ui.rich.Window;
+import esieequest.ui.text.Console;
+import esieequest.ui.text.FileReader;
 
 /**
  * The main class of the program.
diff --git a/src/esieequest/controller/Callback.java b/src/esieequest/engine/Callback.java
index ef03b72..91d8451 100644
--- a/src/esieequest/controller/Callback.java
+++ b/src/esieequest/engine/Callback.java
@@ -1,4 +1,4 @@
-package esieequest.controller;
+package esieequest.engine;
 
 /**
  * The Callback interface.
diff --git a/src/esieequest/controller/GameEngine.java b/src/esieequest/engine/GameEngine.java
index ae76059..8c1ac95 100644
--- a/src/esieequest/controller/GameEngine.java
+++ b/src/esieequest/engine/GameEngine.java
@@ -1,14 +1,14 @@
-package esieequest.controller;
-
-import esieequest.controller.commands.Command;
-import esieequest.model.Game;
-import esieequest.model.Text;
-import esieequest.model.characters.MovingCharacter;
-import esieequest.model.events.Scene;
-import esieequest.model.items.Beamer;
-import esieequest.model.items.Item;
-import esieequest.model.map.Room;
-import esieequest.view.Viewable;
+package esieequest.engine;
+
+import esieequest.engine.commands.Command;
+import esieequest.game.Game;
+import esieequest.game.Text;
+import esieequest.game.characters.MovingCharacter;
+import esieequest.game.items.Beamer;
+import esieequest.game.items.Item;
+import esieequest.game.map.Room;
+import esieequest.game.states.Scene;
+import esieequest.ui.Viewable;
 
 /**
  * The game main controller class.
diff --git a/src/esieequest/controller/Input.java b/src/esieequest/engine/Input.java
index 784985e..f1aef10 100644
--- a/src/esieequest/controller/Input.java
+++ b/src/esieequest/engine/Input.java
@@ -1,7 +1,7 @@
-package esieequest.controller;
+package esieequest.engine;
 
 import lombok.Getter;
-import esieequest.controller.commands.Command;
+import esieequest.engine.commands.Command;
 
 /**
  * An user textual input.
diff --git a/src/esieequest/controller/commands/AleaCommand.java b/src/esieequest/engine/commands/AleaCommand.java
index 093f088..1e9fce7 100644
--- a/src/esieequest/controller/commands/AleaCommand.java
+++ b/src/esieequest/engine/commands/AleaCommand.java