diff --git a/src/server/lighttpd.conf b/src/server/lighttpd.conf
index 85f5bfcec..ccdaae453 100644
--- a/src/server/lighttpd.conf
+++ b/src/server/lighttpd.conf
@@ -12,7 +12,7 @@ server.modules              = (
 
 var.basedir = var.CWD 
 
-server.document-root        = basedir + "/gwt/www"
+server.document-root        = basedir + "/../ui/gwt/www"
 
 server.errorlog             = basedir + "/error.log"
 
diff --git a/src/ui/gwt/Editor-compile b/src/ui/gwt/Editor-compile
index 89968b4ce..4106298ea 100644
--- a/src/ui/gwt/Editor-compile
+++ b/src/ui/gwt/Editor-compile
@@ -2,14 +2,11 @@
 
 APPDIR=`dirname $0`;
 
-GWT_DIR="/home/angelov/gwt-linux-1.5.3"
-GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-linux.jar"
-
 if [ -z "$GWT_CLASSPATH" ]; then
   echo 'ERROR: $GWT_CLASSPATH is not set'
   echo 'Set $GWT_CLASSPATH to point to the GWT JAR files. For example:'
-  echo 'export GWT_DIR="/Users/bringert/src/gwt-mac-1.5.2"'
-  echo 'export GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-mac.jar"'
+  echo 'export GWT_DIR="/Users/bringert/src/gwt-2.0.4"'
+  echo 'export GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev.jar"'
   exit 1
 fi
 
@@ -17,6 +14,4 @@ if [ `uname` = "Darwin" ]; then
   GWT_JAVA_OPTS=-XstartOnFirstThread
 fi
 
-LIBS=$APPDIR/lib/gwt-dnd-2.5.6.jar
-
-java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www/editor" "$@" se.chalmers.cs.gf.gwt.EditorApp;
+java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$GWT_CLASSPATH" com.google.gwt.dev.Compiler -war "$APPDIR/www/editor" "$@" org.grammaticalframework.ui.gwt.EditorApp;
diff --git a/src/ui/gwt/Fridge-compile b/src/ui/gwt/Fridge-compile
index d8335ae5c..887e253bc 100644
--- a/src/ui/gwt/Fridge-compile
+++ b/src/ui/gwt/Fridge-compile
@@ -2,14 +2,11 @@
 
 APPDIR=`dirname $0`;
 
-GWT_DIR="/home/angelov/gwt-linux-1.5.3"
-GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-linux.jar"
-
 if [ -z "$GWT_CLASSPATH" ]; then
   echo 'ERROR: $GWT_CLASSPATH is not set'
   echo 'Set $GWT_CLASSPATH to point to the GWT JAR files. For example:'
-  echo 'export GWT_DIR="/Users/bringert/src/gwt-mac-1.5.2"'
-  echo 'export GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-mac.jar"'
+  echo 'export GWT_DIR="/Users/bringert/src/gwt-2.0.4"'
+  echo 'export GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev.jar"'
   exit 1
 fi
 
@@ -17,6 +14,4 @@ if [ `uname` = "Darwin" ]; then
   GWT_JAVA_OPTS=-XstartOnFirstThread
 fi
 
-LIBS=$APPDIR/lib/gwt-dnd-2.5.6.jar
-
-java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www/fridge" "$@" se.chalmers.cs.gf.gwt.FridgeApp;
+java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$GWT_CLASSPATH" com.google.gwt.dev.Compiler -war "$APPDIR/www/fridge" "$@" org.grammaticalframework.ui.gwt.FridgeApp;
diff --git a/src/ui/gwt/Morpho-compile b/src/ui/gwt/Morpho-compile
index e3cb451ed..234e18322 100644
--- a/src/ui/gwt/Morpho-compile
+++ b/src/ui/gwt/Morpho-compile
@@ -5,8 +5,8 @@ APPDIR=`dirname $0`;
 if [ -z "$GWT_CLASSPATH" ]; then
   echo 'ERROR: $GWT_CLASSPATH is not set'
   echo 'Set $GWT_CLASSPATH to point to the GWT JAR files. For example:'
-  echo 'export GWT_DIR="/Users/bringert/src/gwt-mac-1.5.2"'
-  echo 'export GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-mac.jar"'
+  echo 'export GWT_DIR="/Users/bringert/src/gwt-2.0.4"'
+  echo 'export GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev.jar"'
   exit 1
 fi
 
@@ -14,6 +14,4 @@ if [ `uname` = "Darwin" ]; then
   GWT_JAVA_OPTS=-XstartOnFirstThread
 fi
 
-LIBS=$APPDIR/lib/gwt-dnd-2.5.6.jar
-
-java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www/morpho" "$@" se.chalmers.cs.gf.gwt.MorphoApp;
+java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.Compiler -war "$APPDIR/www/morpho" "$@" org.grammaticalframework.ui.gwt.MorphoApp;
diff --git a/src/ui/gwt/Translate-compile b/src/ui/gwt/Translate-compile
index a2c6faaf0..220cf4a46 100644
--- a/src/ui/gwt/Translate-compile
+++ b/src/ui/gwt/Translate-compile
@@ -1,14 +1,12 @@
 #!/bin/sh
 
 APPDIR=`dirname $0`;
-export GWT_DIR="/home/angelov/gwt-linux-1.5.3"
-export GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-linux.jar"
 
 if [ -z "$GWT_CLASSPATH" ]; then
   echo 'ERROR: $GWT_CLASSPATH is not set'
   echo 'Set $GWT_CLASSPATH to point to the GWT JAR files. For example:'
-  echo 'export GWT_DIR="/Users/bringert/src/gwt-mac-1.5.2"'
-  echo 'export GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev-mac.jar"'
+  echo 'export GWT_DIR="/Users/bringert/src/gwt-2.0.4"'
+  echo 'export GWT_CLASSPATH="$GWT_DIR/gwt-user.jar:$GWT_DIR/gwt-dev.jar"'
   exit 1
 fi
 
@@ -16,6 +14,4 @@ if [ `uname` = "Darwin" ]; then
   GWT_JAVA_OPTS=-XstartOnFirstThread
 fi
 
-LIBS=$APPDIR/lib/gwt-dnd-2.5.6.jar
-
-java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$LIBS:$GWT_CLASSPATH" com.google.gwt.dev.GWTCompiler -out "$APPDIR/www/translate" "$@" se.chalmers.cs.gf.gwt.TranslateApp;
+java $GWT_JAVA_OPTS -Xmx256M -cp "$APPDIR/src:$APPDIR/bin:$GWT_CLASSPATH" com.google.gwt.dev.Compiler -war "$APPDIR/www/translate" "$@" org.grammaticalframework.ui.gwt.TranslateApp;
diff --git a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/EditorApp.gwt.xml b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/EditorApp.gwt.xml
index ac5dae0b1..0fa154520 100644
--- a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/EditorApp.gwt.xml
+++ b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/EditorApp.gwt.xml
@@ -17,7 +17,7 @@
 
 
       <!-- Specify the app entry point class.                         -->
-      <entry-point class="se.chalmers.cs.gf.gwt.client.EditorApp" />
+      <entry-point class="org.grammaticalframework.ui.gwt.client.EditorApp" />
     
       <!-- Specify the application specific style sheet.              -->
       <stylesheet src="Editor.css" />
diff --git a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp_IE6.gwt.xml b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp_IE6.gwt.xml
index c72067421..70d2b1714 100644
--- a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp_IE6.gwt.xml
+++ b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/FridgeApp_IE6.gwt.xml
@@ -1,5 +1,5 @@
-<module rename-to="se.chalmers.cs.gf.gwt.FridgeApp">
-  <inherits name="se.chalmers.cs.gf.gwt.FridgeApp" />
+<module rename-to="org.grammaticalframework.ui.gwt.FridgeApp">
+  <inherits name="org.grammaticalframework.ui.gwt.FridgeApp" />
   <set-property name="user.agent" value="ie6" />
   <set-property name="locale" value="default" />
 </module>
\ No newline at end of file
diff --git a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/MorphoApp.gwt.xml b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/MorphoApp.gwt.xml
index 3743667f7..9bdd8d5ac 100644
--- a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/MorphoApp.gwt.xml
+++ b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/MorphoApp.gwt.xml
@@ -11,12 +11,8 @@
       <!-- <inherits name="com.google.gwt.user.theme.chrome.Chrome"/> -->
       <!-- <inherits name="com.google.gwt.user.theme.dark.Dark"/>     -->
 
-      <!-- Other module inherits                                      -->
-      <inherits name='com.allen_sauer.gwt.dnd.gwt-dnd'/>
-
-
       <!-- Specify the app entry point class.                         -->
-      <entry-point class="se.chalmers.cs.gf.gwt.client.MorphoApp" />
+      <entry-point class="org.grammaticalframework.ui.gwt.client.MorphoApp" />
     
       <!-- Specify the application specific style sheet.              -->
       <stylesheet src="Morpho.css" />
diff --git a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeTextPanel.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeTextPanel.java
index 804db509f..a44a72446 100644
--- a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeTextPanel.java
+++ b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/FridgeTextPanel.java
@@ -29,7 +29,7 @@ public class FridgeTextPanel extends Composite {
 	protected Widget createButtonPanel () {
 		Panel buttons = new VerticalPanel();
 		buttons.setStylePrimaryName("buttons");
-		PushButton deleteLastButton = new PushButton(new Image("se.chalmers.cs.gf.gwt.FridgeApp/delete-last.png"));
+		PushButton deleteLastButton = new PushButton(new Image("org.grammaticalframework.ui.gwt.FridgeApp/delete-last.png"));
 		deleteLastButton.setTitle("Removes the last magnet.");
 		deleteLastButton.addClickListener(new ClickListener () {
 			public void onClick(Widget sender) {
diff --git a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/TranslateApp.java b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/TranslateApp.java
index 5e210a549..d2ae216ec 100644
--- a/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/TranslateApp.java
+++ b/src/ui/gwt/src/org/grammaticalframework/ui/gwt/client/TranslateApp.java
@@ -82,7 +82,7 @@ public class TranslateApp implements EntryPoint {
 	}
 
 	protected Widget createAbsTreeButton(final String abstractTree) {
-		Image treeBtn = new Image("se.chalmers.cs.gf.gwt.TranslateApp/tree-btn.png");
+		Image treeBtn = new Image("org.grammaticalframework.ui.gwt.TranslateApp/tree-btn.png");
 		treeBtn.addClickListener(
 			new ClickListener() {
 				public void onClick(Widget sender) {
@@ -118,7 +118,7 @@ public class TranslateApp implements EntryPoint {
 	}
 
 	protected Widget createAlignButton(final String abstractTree) {
-		Image alignBtn = new Image("se.chalmers.cs.gf.gwt.TranslateApp/align-btn.png");
+		Image alignBtn = new Image("org.grammaticalframework.ui.gwt.TranslateApp/align-btn.png");
 		alignBtn.addClickListener(
 			new ClickListener() {
 				public void onClick(Widget sender) {
diff --git a/src/ui/gwt/www/fridge/index.html b/src/ui/gwt/www/fridge/index.html
index b530946d5..723e8a252 100644
--- a/src/ui/gwt/www/fridge/index.html
+++ b/src/ui/gwt/www/fridge/index.html
@@ -19,7 +19,7 @@
     <!-- If you add any GWT meta tags, they must   -->
     <!-- be added before this line.                -->
     <!--                                           -->
-    <script type="text/javascript" language="javascript" src="se.chalmers.cs.gf.gwt.FridgeApp/se.chalmers.cs.gf.gwt.FridgeApp.nocache.js"></script>
+    <script type="text/javascript" language="javascript" src="org.grammaticalframework.ui.gwt.FridgeApp/org.grammaticalframework.ui.gwt.FridgeApp.nocache.js"></script>
   </head>
 
   <!--                                           -->
diff --git a/src/ui/gwt/www/translate/index.html b/src/ui/gwt/www/translate/index.html
index 8bad4c250..4b6abf89a 100644
--- a/src/ui/gwt/www/translate/index.html
+++ b/src/ui/gwt/www/translate/index.html
@@ -19,7 +19,7 @@
     <!-- If you add any GWT meta tags, they must   -->
     <!-- be added before this line.                -->
     <!--                                           -->
-    <script type="text/javascript" language="javascript" src="se.chalmers.cs.gf.gwt.TranslateApp/se.chalmers.cs.gf.gwt.TranslateApp.nocache.js"></script>
+    <script type="text/javascript" language="javascript" src="org.grammaticalframework.ui.gwt.TranslateApp/org.grammaticalframework.ui.gwt.TranslateApp.nocache.js"></script>
   </head>
 
   <!--                                           -->