92 files changed, 338 insertions, 331 deletions

diff --git a/build.xml b/build.xml
index 1f76860..829d4f5 100644
--- a/build.xml
+++ b/build.xml
@@ -28,6 +28,13 @@
                 <copy todir="war/WEB-INF/lib" file="lib/startup2.jar" />
         </target>
 
+        <target name="res" description="Copy resources to res">
+                <mkdir dir="war" />
+                <copy todir="war">
+                        <fileset dir="res" />
+                </copy>
+        </target>
+
         <target name="javac" depends="libs" description="Compile java source to bytecode">
                 <mkdir dir="war/WEB-INF/classes" />
                 <javac srcdir="src" includes="**" encoding="utf-8" destdir="war/WEB-INF/classes" source="1.7" target="1.7" nowarn="true" debug="true" debuglevel="lines,vars,source">
@@ -38,7 +45,7 @@
                 </copy>
         </target>
 
-        <target name="gwtc" depends="javac" description="GWT compile to JavaScript (production mode)">
+        <target name="gwtc" depends="javac,res" description="GWT compile to JavaScript (production mode)">
                 <java failonerror="true" fork="true" classname="com.google.gwt.dev.Compiler">
                         <classpath>
                                 <pathelement location="src" />
diff --git a/res/res/snd/END.ogg b/res/resources/audio/END.ogg
index db2b370..db2b370 100644
--- a/res/res/snd/END.ogg
+++ b/res/resources/audio/END.ogg
diff --git a/res/res/snd/FEED_ATHANASE.ogg b/res/resources/audio/FEED_ATHANASE.ogg
index 94e8668..94e8668 100644
--- a/res/res/snd/FEED_ATHANASE.ogg
+++ b/res/resources/audio/FEED_ATHANASE.ogg
diff --git a/res/res/snd/FIND_CONSOLE.ogg b/res/resources/audio/FIND_CONSOLE.ogg
index 39aee7e..39aee7e 100644
--- a/res/res/snd/FIND_CONSOLE.ogg
+++ b/res/resources/audio/FIND_CONSOLE.ogg
diff --git a/res/res/snd/FIND_DISK.ogg b/res/resources/audio/FIND_DISK.ogg
index b852de2..b852de2 100644
--- a/res/res/snd/FIND_DISK.ogg
+++ b/res/resources/audio/FIND_DISK.ogg
diff --git a/res/res/snd/GAME_LOST.ogg b/res/resources/audio/GAME_LOST.ogg
index 71dffae..71dffae 100644
--- a/res/res/snd/GAME_LOST.ogg
+++ b/res/resources/audio/GAME_LOST.ogg
diff --git a/res/res/snd/INSTALL_CONSOLE.ogg b/res/resources/audio/INSTALL_CONSOLE.ogg
index fe7a296..fe7a296 100644
--- a/res/res/snd/INSTALL_CONSOLE.ogg
+++ b/res/resources/audio/INSTALL_CONSOLE.ogg
diff --git a/res/res/snd/INTRO.ogg b/res/resources/audio/INTRO.ogg
index da90187..da90187 100644
--- a/res/res/snd/INTRO.ogg
+++ b/res/resources/audio/INTRO.ogg
diff --git a/res/res/snd/RUN_CONSOLE.ogg b/res/resources/audio/RUN_CONSOLE.ogg
index 8c43dd1..8c43dd1 100644
--- a/res/res/snd/RUN_CONSOLE.ogg
+++ b/res/resources/audio/RUN_CONSOLE.ogg
diff --git a/res/res/snd/WHAT_HAPPENED.ogg b/res/resources/audio/WHAT_HAPPENED.ogg
index 0aac689..0aac689 100644
--- a/res/res/snd/WHAT_HAPPENED.ogg
+++ b/res/resources/audio/WHAT_HAPPENED.ogg
diff --git a/res/res/img/placeholder.jpg b/res/resources/images/placeholder.jpg
index a837f76..a837f76 100644
--- a/res/res/img/placeholder.jpg
+++ b/res/resources/images/placeholder.jpg
diff --git a/res/res/img/placeholder.svg b/res/resources/images/placeholder.svg
index 679edec..679edec 100644
--- a/res/res/img/placeholder.svg
+++ b/res/resources/images/placeholder.svg
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.engine.GameEngine;
+import esieequest.ui.Viewable;
+import esieequest.ui.