67 files changed, 1686 insertions, 1382 deletions

diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index c755741..dd548f1 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -6,9 +6,9 @@ import java.util.List;
 import javax.swing.JApplet;
 
 import esieequest.engine.GameEngine;
-import esieequest.ui.Viewable;
-import esieequest.ui.rich.Applet;
-import esieequest.ui.rich.Window;
+import esieequest.ui.View;
+import esieequest.ui.rich.app.Applet;
+import esieequest.ui.rich.app.Window;
 import esieequest.ui.text.Console;
 import esieequest.ui.text.FileReader;
 
@@ -45,7 +45,7 @@ public class Main extends JApplet {
          */
         public static void main(final String[] args) {
                 final List<String> arguments = Arrays.asList(args);
-                Viewable view;
+                View view;
 
                 if (arguments.contains("--file")) {
                         if (arguments.size() < 2) {
diff --git a/src/esieequest/engine/GameEngine.java b/src/esieequest/engine/GameEngine.java
index 573d3a8..9211eb0 100644
--- a/src/esieequest/engine/GameEngine.java
+++ b/src/esieequest/engine/GameEngine.java
@@ -1,15 +1,15 @@
 package esieequest.engine;
 
 import esieequest.engine.commands.Command;
+import esieequest.engine.scheduler.Callback;
 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.Callback;
 import esieequest.game.states.Scene;
-import esieequest.ui.Viewable;
+import esieequest.ui.View;
 
 /**
  * The game main controller class.
@@ -20,7 +20,7 @@ import esieequest.ui.Viewable;
 public class GameEngine {
 
         private final Game game;
-        private final Viewable view;
+        private final View view;
 
         /**
          * Instantiates a game engine with the given model and view.
@@ -30,11 +30,11 @@ public class GameEngine {
          * @param view
          *            the view
          */
-        public GameEngine(final Viewable view, final Game game) {
+        public GameEngine(final View view, final Game game) {
                 this.game = game;
                 this.view = view;
 
-                this.view.setController(this);
+                this.view.setGameEngine(this);
 
                 this.view.show();
         }
@@ -47,7 +47,7 @@ public class GameEngine {
          * @param challengeMode
          *            the mode
          */
-        public GameEngine(final Viewable view, final boolean challengeMode) {
+        public GameEngine(final View view, final boolean challengeMode) {
                 this(view, new Game(challengeMode));
         }
 
@@ -57,7 +57,7 @@ public class GameEngine {
          * @param view
          *            the view
          */
-        public GameEngine(final Viewable view) {
+        public GameEngine(final View view) {
                 this(view, false);
         }
 
diff --git a/src/esieequest/engine/audioplayer/AudioPlayer.java b/src/esieequest/engine/audioplayer/AudioPlayer.java
new file mode 100644
index 0000000..3b65ec5
--- /dev/null
+++ b/src/esieequest/engine/audioplayer/AudioPlayer.java