Merge branch 'master' into layoutgraph

Conflicts:
	client/src/com/vaadin/client/ComponentLocator.java
	client/src/com/vaadin/client/ui/AbstractComponentConnector.java

315 files changed, 2239 insertions, 1459 deletions

diff --git a/client/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml
index 278d92f38f..26ab7478e0 100644..100755
--- a/client/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
+++ b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml
@@ -8,6 +8,6 @@
 
 	<inherits name="com.vaadin.Vaadin" />
 
-	<entry-point class="com.vaadin.terminal.gwt.client.ApplicationConfiguration" />
+	<entry-point class="com.vaadin.client.ApplicationConfiguration" />
 
 </module>
diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml
index 44357b24a0..f7d1cf8410 100644
--- a/client/src/com/vaadin/Vaadin.gwt.xml
+++ b/client/src/com/vaadin/Vaadin.gwt.xml
@@ -1,43 +1,45 @@
+
 <module>
-	<!-- This GWT module inherits all Vaadin client side functionality modules. 
-		This is the module you want to inherit in your client side project to be 
-		able to use com.vaadin.* classes. -->
+    <!-- This GWT module inherits all Vaadin client side functionality modules. 
+        This is the module you want to inherit in your client side project to be 
+        able to use com.vaadin.* classes. -->
 
-	<!-- Hint for WidgetSetBuilder not to automatically update the file -->
-	<!-- WS Compiler: manually edited -->
+    <!-- Hint for WidgetSetBuilder not to automatically update the file -->
+    <!-- WS Compiler: manually edited -->
 
-	<inherits name="com.google.gwt.user.User" />
+    <inherits name="com.google.gwt.user.User" />
 
-	<inherits name="com.google.gwt.http.HTTP" />
+    <inherits name="com.google.gwt.http.HTTP" />
 
-	<inherits name="com.google.gwt.json.JSON" />
+    <inherits name="com.google.gwt.json.JSON" />
 
-	<inherits name="com.vaadin.terminal.gwt.VaadinBrowserSpecificOverrides" />
+    <inherits name="com.vaadin.VaadinBrowserSpecificOverrides" />
 
-	<source path="terminal/gwt/client" />
-	<source path="shared" />
+    <source path="client" />
+    <source path="shared" />
 
-	<!-- Use own Scheduler implementation to be able to track if commands are 
-		running -->
-	<replace-with class="com.vaadin.terminal.gwt.client.VSchedulerImpl">
-		<when-type-is class="com.google.gwt.core.client.impl.SchedulerImpl" />
-	</replace-with>
+    <!-- Use own Scheduler implementation to be able to track if commands 
+        are running -->
+    <replace-with class="com.vaadin.client.VSchedulerImpl">
+        <when-type-is class="com.google.gwt.core.client.impl.SchedulerImpl" />
+    </replace-with>
 
-	<replace-with class="com.vaadin.terminal.gwt.client.VDebugConsole">
-		<when-type-is class="com.vaadin.terminal.gwt.client.Console" />
-	</replace-with>
+    <replace-with class="com.vaadin.client.VDebugConsole">
+        <when-type-is class="com.vaadin.client.Console" />
+    </replace-with>
 
-	<generate-with
-		class="com.vaadin.terminal.gwt.widgetsetutils.AcceptCriteriaFactoryGenerator">
-		<when-type-is
-			class="com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterionFactory" />
-	</generate-with>
+    <generate-with
+        class="com.vaadin.server.widgetsetutils.AcceptCriteriaFactoryGenerator">
+        <when-type-is class="com.vaadin.client.ui.dd.VAcceptCriterionFactory" />
+    </generate-with>
 
-	<generate-with class="com.vaadin.terminal.gwt.widgetsetutils.ConnectorBundleLoaderFactory">
-		<when-type-assignable class="com.vaadin.terminal.gwt.client.metadata.ConnectorBundleLoader" />
-	</generate-with>
+    <generate-with
+        class="com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory">
+        <when-type-assignable
+            class="com.vaadin.client.metadata.ConnectorBundleLoader" />
+    </generate-with>
 
-	<!-- Use the new cross site linker to get a nocache.js without document.write -->
-	<add-linker name="xsiframe" />
+    <!-- Use the new cross site linker to get a nocache.js without document.write -->
+    <add-linker name="xsiframe" />
 
 </module>
diff --git a/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml b/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml
new file mode 100644
index 0000000000..9b3049a60c
--- /dev/null
+++ b/client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml
@@ -0,0 +1,47 @@
+<module>
+	<!-- This GWT module defines the browser specific overrides used by Vaadin -->
+
+	<!-- Hint for WidgetSetBuilder not to automatically update the file -->
+	<!-- WS Compiler: manually edited -->
+
+	<!-- Fall through to this rule for everything but IE -->
+	<replace-with
+		class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy">
+		<when-type-is
+			class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy" />
+	</replace-with>
+
+	<replace-with
+		class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategyIE">
+		<when-type-is
+			class="com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy" />
+		<any>
+			<when-property-is name="user.agent" value="ie8" />
+		</any>
+	</replace-with>
+
+	<!-- Fall through to this rule for everything but IE -->
+	<replace-with class="com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper">
+		<when-type-is class="com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper" />
+	</replace-with>
+
+	<replace-with class="com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapperIE">
+		<when-type-is class="com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper" />
+		<any>
+			<when-property-is name="user.agent" value="ie8" />
+		</any>
+	</replace-with>
+
+	<!-- Fall through to this rule for everything but IE -->
+	<replace-with class="com.vaadin.client.LayoutManager">
+		<when-type-is class="com.vaadin.client.LayoutManager" />
+	</replace-with>
+
+	<replace-with class="com.vaadin.client.LayoutManagerIE8">
+		<when-type-is class="com.vaadin.client.LayoutManager" />
+		<any>
+			<when-property-is name="user.agent" value="ie8" />
+		</any>
+	</replace-with>
+
+</module>
diff --git a/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/client/src/com/vaadin/client/ApplicationConfiguration.java
index 1150f122b2..e364facb43 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/client/src/com/vaadin/client/ApplicationConfiguration.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,13 +30,13 @@ import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Window;
+import com.vaadin.client.metadata.BundleLoadCallback;
+import com.vaadin.client.metadata.ConnectorBundleLoader;
+import com.vaadin.client.metadata.NoDataException;
+import com.vaadin.client.metadata.TypeData;
+import com.vaadin.client.ui.UnknownComponentConnector;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.gwt.client.metadata.BundleLoadCallback;
-import com.vaadin.terminal.gwt.client.metadata.ConnectorBundleLoader;
-import com.vaadin.terminal.gwt.client.metadata.NoDataException;
-import com.vaadin.terminal.gwt.client.metadata.TypeData;
-import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
 
 public class ApplicationConfiguration implements EntryPoint {
 
@@ -146,7 +146,7 @@ public class ApplicationConfiguration implements EntryPoint {
          * 
          * @return a string with the version
          * 
-         * @see com.vaadin.terminal.gwt.server.AbstractApplicationServlet#VERSION
+         * @see com.vaadin.server.AbstractApplicationServlet#VERSION
          */
         private native String getVaadinVersion()
         /*-{
@@ -556,7 +556,7 @@ public class ApplicationConfiguration implements EntryPoint {
      */
     public native static void registerCallback(String widgetsetName)
     /*-{
-        var callbackHandler = $entry(@com.vaadin.terminal.gwt.client.ApplicationConfiguration::startApplication(Ljava/lang/String;));
+        var callbackHandler = $entry(@com.vaadin.client.ApplicationConfiguration::startApplication(Ljava/lang/String;));
         $wnd.vaadin.registerWidgetset(widgetsetName, callbackHandler);
     }-*/;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index a984433907..88510e7bf6 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -53,6 +53,28 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConfiguration.ErrorMessage;
+import com.vaadin.client.ResourceLoader.ResourceLoadEvent;
+import com.vaadin.client.ResourceLoader.ResourceLoadListener;
+import com.vaadin.client.communication.HasJavaScriptConnectorHelper;
+import com.vaadin.client.communication.JsonDecoder;
+import com.vaadin.client.communication.JsonEncoder;
+import com.vaadin.client.communication.RpcManager;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.extensions.AbstractExtensionConnector;
+import com.vaadin.client.metadata.ConnectorBundleLoader;
+import com.vaadin.client.metadata.NoDataException;
+import com.vaadin.client.metadata.Property;
+import com.vaadin.client.metadata.Type;
+import com.vaadin.client.metadata.TypeData;
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.AbstractConnector;
+import com.vaadin.client.ui.VContextMenu;
+import com.vaadin.client.ui.UI.UIConnector;
+import com.vaadin.client.ui.dd.VDragAndDropManager;
+import com.vaadin.client.ui.notification.VNotification;
+import com.vaadin.client.ui.notification.VNotification.HideEvent;
+import com.vaadin.client.ui.window.WindowConnector;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.Version;
@@ -60,33 +82,11 @@ import com.vaadin.shared.communication.LegacyChangeVariablesInvocation;
 import com.vaadin.shared.communication.MethodInvocation;
 import com.vaadin.shared.communication.SharedState;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConfiguration.ErrorMessage;
-import com.vaadin.terminal.gwt.client.ResourceLoader.ResourceLoadEvent;
-import com.vaadin.terminal.gwt.client.ResourceLoader.ResourceLoadListener;
-import com.vaadin.terminal.gwt.client.communication.HasJavaScriptConnectorHelper;
-import com.vaadin.terminal.gwt.client.communication.JsonDecoder;
-import com.vaadin.terminal.gwt.client.communication.JsonEncoder;
-import com.vaadin.terminal.gwt.client.communication.RpcManager;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector;
-import com.vaadin.terminal.gwt.client.metadata.ConnectorBundleLoader;
-import com.vaadin.terminal.gwt.client.metadata.NoDataException;
-import com.vaadin.terminal.gwt.client.metadata.Property;
-import com.vaadin.terminal.gwt.client.metadata.Type;
-import com.vaadin.terminal.gwt.client.metadata.TypeData;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.AbstractConnector;
-import com.vaadin.terminal.gwt.client.ui.VContextMenu;
-import com.vaadin.terminal.gwt.client.ui.UI.UIConnector;
-import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager;
-import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
-import com.vaadin.terminal.gwt.client.ui.notification.VNotification.HideEvent;
-import com.vaadin.terminal.gwt.client.ui.window.WindowConnector;
 
 /**
  * This is the client side communication "engine", managing client-server
  * communication with its server side counterpart
- * com.vaadin.terminal.gwt.server.AbstractCommunicationManager.
+ * com.vaadin.server.AbstractCommunicationManager.
  * 
  * Client-side connectors receive updates from the corresponding server-side
  * connector (typically component) as state updates or RPC calls. The connector
@@ -193,6 +193,45 @@ public class ApplicationConnection {
 
     private final RpcManager rpcManager;
 
+    /**
+     * If renderingLocks contains any objects, rendering is to be suspended
+     * until the collection is empty or a timeout has occurred.
+     */
+    private Set<Object> renderingLocks = new HashSet<Object>();
+
+    /**
+     * Data structure holding information about pending UIDL messages.
+     */
+    private class PendingUIDLMessage {
+        private Date start;
+        private String jsonText;
+        private ValueMap json;
+
+        public PendingUIDLMessage(Date start, String jsonText, ValueMap json) {
+            this.start = start;
+            this.jsonText = jsonText;
+            this.json = json;
+        }
+
+        public Date getStart() {
+            return start;
+        }
+
+        public String getJsonText() {
+            return jsonText;
+        }
+
+        public ValueMap getJson() {
+            return json;
+        }
+    }
+
+    /** Contains all UIDL messages received while the rendering is suspended */
+    private List<PendingUIDLMessage> pendingUIDLMessages = new ArrayList<PendingUIDLMessage>();
+
+    /** The max timeout the rendering phase may be suspended */
+    private static final int MAX_SUSPENDED_TIMEOUT = 5000;
+
     public static class MultiStepDuration extends Duration {
         private int previousStep = elapsedMillis();
 
@@ -280,10 +319,10 @@ public class ApplicationConnection {
     	var ap = this;
     	var client = {};
     	client.isActive = $entry(function() {
-    		return ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::hasActiveRequest()()
-    				|| ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::isExecutingDeferredCommands()();
+    		return ap.@com.vaadin.client.ApplicationConnection::hasActiveRequest()()
+    				|| ap.@com.vaadin.client.ApplicationConnection::isExecutingDeferredCommands()();
     	});
-    	var vi = ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::getVersionInfo()();
+    	var vi = ap.@com.vaadin.client.ApplicationConnection::getVersionInfo()();
     	if (vi) {
     		client.getVersionInfo = function() {
     			return vi;
@@ -292,18 +331,18 @@ public class ApplicationConnection {
 
     	client.getProfilingData = $entry(function() {
     	    var pd = [
-        	    ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::lastProcessingTime,
-                    ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::totalProcessingTime
+        	    ap.@com.vaadin.client.ApplicationConnection::lastProcessingTime,
+                    ap.@com.vaadin.client.ApplicationConnection::totalProcessingTime
     	        ];
-    	    pd = pd.concat(ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::serverTimingInfo);
+    	    pd = pd.concat(ap.@com.vaadin.client.ApplicationConnection::serverTimingInfo);
     	    return pd;
     	});
 
     	client.getElementByPath = $entry(function(id) {
-    		return componentLocator.@com.vaadin.terminal.gwt.client.ComponentLocator::getElementByPath(Ljava/lang/String;)(id);
+    		return componentLocator.@com.vaadin.client.ComponentLocator::getElementByPath(Ljava/lang/String;)(id);
     	});
     	client.getPathForElement = $entry(function(element) {
-    		return componentLocator.@com.vaadin.terminal.gwt.client.ComponentLocator::getPathForElement(Lcom/google/gwt/user/client/Element;)(element);
+    		return componentLocator.@com.vaadin.client.ComponentLocator::getPathForElement(Lcom/google/gwt/user/client/Element;)(element);
     	});
 
     	$wnd.vaadin.clients[TTAppId] = client;
@@ -350,7 +389,7 @@ public class ApplicationConnection {
     		if (oldSync) {
     			oldSync();
     		}
-    		app.@com.vaadin.terminal.gwt.client.ApplicationConnection::sendPendingVariableChanges()();
+    		app.@com.vaadin.client.ApplicationConnection::sendPendingVariableChanges()();
     	});
     	var oldForceLayout;
     	if ($wnd.vaadin.forceLayout) {
@@ -360,7 +399,7 @@ public class ApplicationConnection {
     		if (oldForceLayout) {
     			oldForceLayout();
     		}
-    		app.@com.vaadin.terminal.gwt.client.ApplicationConnection::forceLayout()();
+    		app.@com.vaadin.client.ApplicationConnection::forceLayout()();
     	});
     }-*/;
 
@@ -1010,6 +1049,17 @@ public class ApplicationConnection {
 
     protected void handleUIDLMessage(final Date start, final String jsonText,
             final ValueMap json) {
+        if (!renderingLocks.isEmpty()) {
+            // Some component is doing something that can't be interrupted
+            // (e.g. animation that should be smooth). Enqueue the UIDL
+            // message for later processing.
+            VConsole.log("Postponing UIDL handling due to lock...");
+            pendingUIDLMessages.add(new PendingUIDLMessage(start, jsonText,
+                    json));
+            forceHandleMessage.schedule(MAX_SUSPENDED_TIMEOUT);
+            return;
+        }
+
         VConsole.log("Handling message from server");
         // Handle redirect
         if (json.containsKey("redirect")) {
@@ -2753,4 +2803,55 @@ public class ApplicationConnection {
             callback.onError(null, re);
         }
     }
+
+    /**
+     * Timer used to make sure that no misbehaving components can lock the
+     * rendering phase forever.
+     */
+    Timer forceHandleMessage = new Timer() {
+        @Override
+        public void run() {
+            VConsole.log("WARNING: rendering was never resumed, forcing reload...");
+            renderingLocks.clear();
+            handlePendingMessages();
+        }
+    };
+
+    /**
+     * This method can be used to postpone rendering of a response for a short
+     * period of time (e.g. to avoid the rendering process during animation).
+     * 
+     * @param lock
+     */
+    public void suspendRendering(Object lock) {
+        renderingLocks.add(lock);
+    }
+
+    /**
+     * Resumes the rendering process once all locks have been removed.
+     * 
+     * @param lock
+     */
+    public void resumeRendering(Object lock) {
+        VConsole.log("...resuming UIDL handling.");
+        renderingLocks.remove(lock);
+        if (renderingLocks.isEmpty()) {
+            VConsole.log("No more rendering locks, rendering pending requests.");
+            forceHandleMessage.cancel();
+            handlePendingMessages();
+        }
+    }
+
+    /**
+     * Handles all pending UIDL messages queued while the rendering was
+     * suspended.
+     */
+    private void handlePendingMessages() {
+        for (PendingUIDLMessage pending : pendingUIDLMessages) {
+            handleUIDLMessage(pending.getStart(), pending.getJsonText(),
+                    pending.getJson());
+        }
+        pendingUIDLMessages.clear();
+    }
+
 }
diff --git a/client/src/com/vaadin/terminal/gwt/client/BrowserInfo.java b/client/src/com/vaadin/client/BrowserInfo.java
index 680131c70c..f7c8d2f331 100644
--- a/client/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
+++ b/client/src/com/vaadin/client/BrowserInfo.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.user.client.ui.RootPanel;
 import com.vaadin.shared.VBrowserDetails;
diff --git a/client/src/com/vaadin/terminal/gwt/client/CSSRule.java b/client/src/com/vaadin/client/CSSRule.java
index 1571e9bdf0..f32458e5a4 100644
--- a/client/src/com/vaadin/terminal/gwt/client/CSSRule.java
+++ b/client/src/com/vaadin/client/CSSRule.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.core.client.JavaScriptObject;
 
@@ -46,11 +46,11 @@ public class CSSRule {
     var sheet = sheets[i];
     if(sheet.href && sheet.href.indexOf("VAADIN/themes")>-1) {
     // $entry not needed as function is not exported
-    this.@com.vaadin.terminal.gwt.client.CSSRule::rules = @com.vaadin.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Z)(sheet, selector, deep);
+    this.@com.vaadin.client.CSSRule::rules = @com.vaadin.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Z)(sheet, selector, deep);
     return;
     }
     }
-    this.@com.vaadin.terminal.gwt.client.CSSRule::rules = [];
+    this.@com.vaadin.client.CSSRule::rules = [];
     }-*/;
 
     /*
@@ -72,7 +72,7 @@ public class CSSRule {
     if(deep && sheet.imports && sheet.imports.length > 0) {
     for(var i=0; i < sheet.imports.length; i++) {
     // $entry not needed as function is not exported
-    var imports = @com.vaadin.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Z)(sheet.imports[i], selector, deep);
+    var imports = @com.vaadin.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Z)(sheet.imports[i], selector, deep);
     allMatches.concat(imports);
     }
     }
@@ -98,7 +98,7 @@ public class CSSRule {
     } else if(deep && r.type == 3) {
     // Search @import stylesheet
     // $entry not needed as function is not exported
-    var imports = @com.vaadin.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Z)(r.styleSheet, selector, deep);
+    var imports = @com.vaadin.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Z)(r.styleSheet, selector, deep);
     allMatches = allMatches.concat(imports);
     }
     }
@@ -115,10 +115,10 @@ public class CSSRule {
      */
     public native String getPropertyValue(final String propertyName)
     /*-{
-    var j = this.@com.vaadin.terminal.gwt.client.CSSRule::rules.length;
+    var j = this.@com.vaadin.client.CSSRule::rules.length;
     for(var i=0; i<j; i++) {
     // $entry not needed as function is not exported
-    var value = this.@com.vaadin.terminal.gwt.client.CSSRule::rules[i].style[propertyName];
+    var value = this.@com.vaadin.client.CSSRule::rules[i].style[propertyName];
     if(value)
     return value;
     }
diff --git a/client/src/com/vaadin/terminal/gwt/client/ComponentConnector.java b/client/src/com/vaadin/client/ComponentConnector.java
index 066e609d2c..9858ff6abd 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ComponentConnector.java
+++ b/client/src/com/vaadin/client/ComponentConnector.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.ui.Widget;
@@ -33,7 +33,7 @@ public interface ComponentConnector extends ServerConnector {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.VPaintable#getState()
+     * @see com.vaadin.client.VPaintable#getState()
      */
     @Override
     public ComponentState getState();
diff --git a/client/src/com/vaadin/terminal/gwt/client/ComponentContainerConnector.java b/client/src/com/vaadin/client/ComponentContainerConnector.java
index b74e77d01f..926ad2319d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ComponentContainerConnector.java
+++ b/client/src/com/vaadin/client/ComponentContainerConnector.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.List;
 
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.ui.HasWidgets;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler;
+import com.vaadin.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler;
 
 /**
  * An interface used by client-side connectors whose widget is a component
diff --git a/client/src/com/vaadin/terminal/gwt/client/ComponentDetail.java b/client/src/com/vaadin/client/ComponentDetail.java
index cd7ad0178f..d5d4927966 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ComponentDetail.java
+++ b/client/src/com/vaadin/client/ComponentDetail.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.HashMap;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java b/client/src/com/vaadin/client/ComponentDetailMap.java
index 3566d4e86f..1d2f526b6f 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java
+++ b/client/src/com/vaadin/client/ComponentDetailMap.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java b/client/src/com/vaadin/client/ComponentLocator.java
index 70f2efa982..03dd966538 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java
+++ b/client/src/com/vaadin/client/ComponentLocator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -24,17 +24,17 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ui.SubPartAware;
+import com.vaadin.client.ui.UI.VUI;
+import com.vaadin.client.ui.gridlayout.VGridLayout;
+import com.vaadin.client.ui.orderedlayout.VBoxLayout;
+import com.vaadin.client.ui.orderedlayout.VMeasuringOrderedLayout;
+import com.vaadin.client.ui.tabsheet.VTabsheetPanel;
+import com.vaadin.client.ui.window.VWindow;
+import com.vaadin.client.ui.window.WindowConnector;
 import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.communication.SharedState;
-import com.vaadin.terminal.gwt.client.ui.SubPartAware;
-import com.vaadin.terminal.gwt.client.ui.UI.VUI;
-import com.vaadin.terminal.gwt.client.ui.gridlayout.VGridLayout;
-import com.vaadin.terminal.gwt.client.ui.orderedlayout.VBoxLayout;
-import com.vaadin.terminal.gwt.client.ui.orderedlayout.VMeasuringOrderedLayout;
-import com.vaadin.terminal.gwt.client.ui.tabsheet.VTabsheetPanel;
-import com.vaadin.terminal.gwt.client.ui.window.VWindow;
-import com.vaadin.terminal.gwt.client.ui.window.WindowConnector;
 
 /**
  * ComponentLocator provides methods for generating a String locator for a given
diff --git a/client/src/com/vaadin/terminal/gwt/client/ComputedStyle.java b/client/src/com/vaadin/client/ComputedStyle.java
index 6e17dcfab5..f18b3b392c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ComputedStyle.java
+++ b/client/src/com/vaadin/client/ComputedStyle.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.dom.client.Element;
@@ -63,8 +63,8 @@ public class ComputedStyle {
      */
     public final native String getProperty(String name)
     /*-{
-        var cs = this.@com.vaadin.terminal.gwt.client.ComputedStyle::computedStyle;
-        var elem = this.@com.vaadin.terminal.gwt.client.ComputedStyle::elem;
+        var cs = this.@com.vaadin.client.ComputedStyle::computedStyle;
+        var elem = this.@com.vaadin.client.ComputedStyle::elem;
         
         // Border values need to be checked separately. The width might have a 
         // meaningful value even if the border style is "none". In that case the 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ConnectorHierarchyChangeEvent.java b/client/src/com/vaadin/client/ConnectorHierarchyChangeEvent.java
index 6abaa89891..f5dff60e4c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ConnectorHierarchyChangeEvent.java
+++ b/client/src/com/vaadin/client/ConnectorHierarchyChangeEvent.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.io.Serializable;
 import java.util.List;
 
 import com.google.gwt.event.shared.EventHandler;
 import com.google.gwt.event.shared.GwtEvent;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler;
-import com.vaadin.terminal.gwt.client.communication.AbstractServerConnectorEvent;
+import com.vaadin.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler;
+import com.vaadin.client.communication.AbstractServerConnectorEvent;
 
 /**
  * Event for containing data related to a change in the {@link ServerConnector}
diff --git a/client/src/com/vaadin/terminal/gwt/client/ConnectorMap.java b/client/src/com/vaadin/client/ConnectorMap.java
index 8202ef7d17..0c6698bfd5 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ConnectorMap.java
+++ b/client/src/com/vaadin/client/ConnectorMap.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/client/src/com/vaadin/terminal/gwt/client/Console.java b/client/src/com/vaadin/client/Console.java
index 4f292e4e28..c829fa9e1d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/Console.java
+++ b/client/src/com/vaadin/client/Console.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Set;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ContainerResizedListener.java b/client/src/com/vaadin/client/ContainerResizedListener.java
index 01ece2ed80..3ccf68f9f9 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ContainerResizedListener.java
+++ b/client/src/com/vaadin/client/ContainerResizedListener.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 /**
  * ContainerResizedListener interface is useful for Widgets that support
diff --git a/client/src/com/vaadin/terminal/gwt/client/DateTimeService.java b/client/src/com/vaadin/client/DateTimeService.java
index 8cce0846ac..f33c69576a 100644
--- a/client/src/com/vaadin/terminal/gwt/client/DateTimeService.java
+++ b/client/src/com/vaadin/client/DateTimeService.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Date;
 
 import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.gwt.i18n.client.LocaleInfo;
-import com.vaadin.terminal.gwt.client.ui.datefield.VDateField;
+import com.vaadin.client.ui.datefield.VDateField;
 
 /**
  * This class provides date/time parsing services to all components on the
diff --git a/client/src/com/vaadin/terminal/gwt/client/DirectionalManagedLayout.java b/client/src/com/vaadin/client/DirectionalManagedLayout.java
index 323fc5bdf2..b79a9d17ed 100644
--- a/client/src/com/vaadin/terminal/gwt/client/DirectionalManagedLayout.java
+++ b/client/src/com/vaadin/client/DirectionalManagedLayout.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
-import com.vaadin.terminal.gwt.client.ui.ManagedLayout;
+import com.vaadin.client.ui.ManagedLayout;
 
 public interface DirectionalManagedLayout extends ManagedLayout {
     public void layoutVertically();
diff --git a/client/src/com/vaadin/terminal/gwt/client/EventHelper.java b/client/src/com/vaadin/client/EventHelper.java
index 8d09094c1f..14f246e8c1 100644
--- a/client/src/com/vaadin/terminal/gwt/client/EventHelper.java
+++ b/client/src/com/vaadin/client/EventHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import static com.vaadin.shared.EventId.BLUR;
 import static com.vaadin.shared.EventId.FOCUS;
diff --git a/client/src/com/vaadin/terminal/gwt/client/FastStringSet.java b/client/src/com/vaadin/client/FastStringSet.java
index d88f56ed61..f7999f9bda 100644
--- a/client/src/com/vaadin/terminal/gwt/client/FastStringSet.java
+++ b/client/src/com/vaadin/client/FastStringSet.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.JsArrayString;
diff --git a/client/src/com/vaadin/terminal/gwt/client/Focusable.java b/client/src/com/vaadin/client/Focusable.java
index fe468a0548..9694a18db1 100644
--- a/client/src/com/vaadin/terminal/gwt/client/Focusable.java
+++ b/client/src/com/vaadin/client/Focusable.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 /**
  * GWT's HasFocus is way too overkill for just receiving focus in simple
diff --git a/client/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java b/client/src/com/vaadin/client/JavaScriptConnectorHelper.java
index 6494ae3480..80d5297d33 100644
--- a/client/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java
+++ b/client/src/com/vaadin/client/JavaScriptConnectorHelper.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,10 +27,10 @@ import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.JsArray;
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.user.client.Element;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler;
 import com.vaadin.shared.JavaScriptConnectorState;
 import com.vaadin.shared.communication.MethodInvocation;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
 
 public class JavaScriptConnectorHelper {
 
@@ -183,7 +183,7 @@ public class JavaScriptConnectorHelper {
                 return connectorId;
             },
             'getParentId': $entry(function(connectorId) {
-                return h.@com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper::getParentId(Ljava/lang/String;)(connectorId);
+                return h.@com.vaadin.client.JavaScriptConnectorHelper::getParentId(Ljava/lang/String;)(connectorId);
             }),
             'getState': function() {
                 return nativeState;
@@ -195,7 +195,7 @@ public class JavaScriptConnectorHelper {
                 return rpcObjects.@java.util.Map::get(Ljava/lang/Object;)(iface);
             }),
             'getElement': $entry(function(connectorId) {
-                return h.@com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper::getWidgetElement(Ljava/lang/String;)(connectorId);
+                return h.@com.vaadin.client.JavaScriptConnectorHelper::getWidgetElement(Ljava/lang/String;)(connectorId);
             }),
             'registerRpc': function(iface, rpcHandler) {
                 //registerRpc(handler) -> registerRpc('', handler);
@@ -209,7 +209,7 @@ public class JavaScriptConnectorHelper {
                 registeredRpc[iface].push(rpcHandler);
             },
             'translateVaadinUri': $entry(function(uri) {
-                return c.@com.vaadin.terminal.gwt.client.ApplicationConnection::translateVaadinUri(Ljava/lang/String;)(uri);
+                return c.@com.vaadin.client.ApplicationConnection::translateVaadinUri(Ljava/lang/String;)(uri);
             }),
         };
     }-*/;
@@ -219,7 +219,7 @@ public class JavaScriptConnectorHelper {
     /*-{
         var self = this;
         rpc[method] = $entry(function() {
-            self.@com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper::fireRpc(Ljava/lang/String;Ljava/lang/String;Lcom/google/gwt/core/client/JsArray;)(iface, method, arguments);
+            self.@com.vaadin.client.JavaScriptConnectorHelper::fireRpc(Ljava/lang/String;Ljava/lang/String;Lcom/google/gwt/core/client/JsArray;)(iface, method, arguments);
         });
     }-*/;
 
@@ -374,7 +374,7 @@ public class JavaScriptConnectorHelper {
     /*-{
         connector[name] = $entry(function() {
             var args = Array.prototype.slice.call(arguments, 0);
-            h.@com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper::fireCallback(Ljava/lang/String;Lcom/google/gwt/core/client/JsArray;)(name, args);
+            h.@com.vaadin.client.JavaScriptConnectorHelper::fireCallback(Ljava/lang/String;Lcom/google/gwt/core/client/JsArray;)(name, args);
         });
     }-*/;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java b/client/src/com/vaadin/client/JavaScriptExtension.java
index e94e0a739b..0a3d6b81ba 100644
--- a/client/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java
+++ b/client/src/com/vaadin/client/JavaScriptExtension.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
+import com.vaadin.client.communication.HasJavaScriptConnectorHelper;
+import com.vaadin.client.extensions.AbstractExtensionConnector;
+import com.vaadin.server.AbstractJavaScriptExtension;
 import com.vaadin.shared.JavaScriptExtensionState;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.AbstractJavaScriptExtension;
-import com.vaadin.terminal.gwt.client.communication.HasJavaScriptConnectorHelper;
-import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector;
 
 @Connect(AbstractJavaScriptExtension.class)
 public final class JavaScriptExtension extends AbstractExtensionConnector
diff --git a/client/src/com/vaadin/terminal/gwt/client/LayoutManager.java b/client/src/com/vaadin/client/LayoutManager.java
index 3deb581848..b456010721 100644
--- a/client/src/com/vaadin/terminal/gwt/client/LayoutManager.java
+++ b/client/src/com/vaadin/client/LayoutManager.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -27,14 +27,14 @@ import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Overflow;
 import com.google.gwt.user.client.Timer;
-import com.vaadin.terminal.gwt.client.MeasuredSize.MeasureResult;
-import com.vaadin.terminal.gwt.client.ui.ManagedLayout;
-import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
-import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
-import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeEvent;
-import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeListener;
-import com.vaadin.terminal.gwt.client.ui.layout.LayoutDependencyTree;
-import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
+import com.vaadin.client.MeasuredSize.MeasureResult;
+import com.vaadin.client.ui.ManagedLayout;
+import com.vaadin.client.ui.PostLayoutListener;
+import com.vaadin.client.ui.SimpleManagedLayout;
+import com.vaadin.client.ui.layout.ElementResizeEvent;
+import com.vaadin.client.ui.layout.ElementResizeListener;
+import com.vaadin.client.ui.layout.LayoutDependencyTree;
+import com.vaadin.client.ui.notification.VNotification;
 
 public class LayoutManager {
     private static final String LOOP_ABORT_MESSAGE = "Aborting layout after 100 passes. This would probably be an infinite loop.";
diff --git a/client/src/com/vaadin/terminal/gwt/client/LayoutManagerIE8.java b/client/src/com/vaadin/client/LayoutManagerIE8.java
index 3e47865cdc..4cc06baf4c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/LayoutManagerIE8.java
+++ b/client/src/com/vaadin/client/LayoutManagerIE8.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/client/src/com/vaadin/terminal/gwt/client/LocaleNotLoadedException.java b/client/src/com/vaadin/client/LocaleNotLoadedException.java
index a2d6bdc860..479f795c4b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/LocaleNotLoadedException.java
+++ b/client/src/com/vaadin/client/LocaleNotLoadedException.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 @SuppressWarnings("serial")
 public class LocaleNotLoadedException extends Exception {
diff --git a/client/src/com/vaadin/terminal/gwt/client/LocaleService.java b/client/src/com/vaadin/client/LocaleService.java
index 15a3230c58..a95fcef966 100644
--- a/client/src/com/vaadin/terminal/gwt/client/LocaleService.java
+++ b/client/src/com/vaadin/client/LocaleService.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/client/src/com/vaadin/terminal/gwt/client/MeasuredSize.java b/client/src/com/vaadin/client/MeasuredSize.java
index ff8b591461..48585ae7c5 100644
--- a/client/src/com/vaadin/terminal/gwt/client/MeasuredSize.java
+++ b/client/src/com/vaadin/client/MeasuredSize.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.core.client.JsArrayString;
 import com.google.gwt.dom.client.Element;
diff --git a/client/src/com/vaadin/terminal/gwt/client/MouseEventDetailsBuilder.java b/client/src/com/vaadin/client/MouseEventDetailsBuilder.java
index 51af1a73a9..2e8d669844 100644
--- a/client/src/com/vaadin/terminal/gwt/client/MouseEventDetailsBuilder.java
+++ b/client/src/com/vaadin/client/MouseEventDetailsBuilder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NativeEvent;
diff --git a/client/src/com/vaadin/terminal/gwt/client/NullConsole.java b/client/src/com/vaadin/client/NullConsole.java
index b17eaddd9f..afc3d2289d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/NullConsole.java
+++ b/client/src/com/vaadin/client/NullConsole.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Set;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/Paintable.java b/client/src/com/vaadin/client/Paintable.java
index 739f9d6594..bb5e278d71 100644
--- a/client/src/com/vaadin/terminal/gwt/client/Paintable.java
+++ b/client/src/com/vaadin/client/Paintable.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 /**
  * An interface used by client-side widgets or paintable parts to receive
diff --git a/client/src/com/vaadin/terminal/gwt/client/RenderInformation.java b/client/src/com/vaadin/client/RenderInformation.java
index 0fef0a9d65..aa7a0f594b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/RenderInformation.java
+++ b/client/src/com/vaadin/client/RenderInformation.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.user.client.Element;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/RenderSpace.java b/client/src/com/vaadin/client/RenderSpace.java
index e92a72de86..839f401be0 100644
--- a/client/src/com/vaadin/terminal/gwt/client/RenderSpace.java
+++ b/client/src/com/vaadin/client/RenderSpace.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
-import com.vaadin.terminal.gwt.client.RenderInformation.Size;
+import com.vaadin.client.RenderInformation.Size;
 
 /**
  * Contains information about render area.
diff --git a/client/src/com/vaadin/terminal/gwt/client/ResourceLoader.java b/client/src/com/vaadin/client/ResourceLoader.java
index 57083641ba..f9925f89a4 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ResourceLoader.java
+++ b/client/src/com/vaadin/client/ResourceLoader.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -334,13 +334,13 @@ public class ResourceLoader {
             element.onload = null;
             element.onerror = null;
             element.onreadystatechange = null;
-            listener.@com.vaadin.terminal.gwt.client.ResourceLoader.ResourceLoadListener::onLoad(Lcom/vaadin/terminal/gwt/client/ResourceLoader$ResourceLoadEvent;)(event);
+            listener.@com.vaadin.client.ResourceLoader.ResourceLoadListener::onLoad(Lcom/vaadin/client/ResourceLoader$ResourceLoadEvent;)(event);
         });
         element.onerror = $entry(function() {
             element.onload = null;
             element.onerror = null;
             element.onreadystatechange = null;
-            listener.@com.vaadin.terminal.gwt.client.ResourceLoader.ResourceLoadListener::onError(Lcom/vaadin/terminal/gwt/client/ResourceLoader$ResourceLoadEvent;)(event);
+            listener.@com.vaadin.client.ResourceLoader.ResourceLoadListener::onError(Lcom/vaadin/client/ResourceLoader$ResourceLoadEvent;)(event);
         });
         element.onreadystatechange = function() { 
             if ("loaded" === element.readyState || "complete" === element.readyState ) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ServerConnector.java b/client/src/com/vaadin/client/ServerConnector.java
index 891e45edb5..85eeab29ff 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ServerConnector.java
+++ b/client/src/com/vaadin/client/ServerConnector.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Collection;
 import java.util.List;
 
 import com.google.gwt.event.shared.GwtEvent;
 import com.google.web.bindery.event.shared.HandlerRegistration;
+import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.SharedState;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
 
 /**
  * Interface implemented by all client side classes that can be communicate with
diff --git a/client/src/com/vaadin/terminal/gwt/client/SimpleTree.java b/client/src/com/vaadin/client/SimpleTree.java
index d5d81d7e44..2252dfe19e 100644
--- a/client/src/com/vaadin/terminal/gwt/client/SimpleTree.java
+++ b/client/src/com/vaadin/client/SimpleTree.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.SpanElement;
diff --git a/client/src/com/vaadin/terminal/gwt/client/StyleConstants.java b/client/src/com/vaadin/client/StyleConstants.java
index b4955ccd14..ad8a21b3e7 100644
--- a/client/src/com/vaadin/terminal/gwt/client/StyleConstants.java
+++ b/client/src/com/vaadin/client/StyleConstants.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 public class StyleConstants {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/SuperDevMode.java b/client/src/com/vaadin/client/SuperDevMode.java
index 200ceb730a..f52e885e87 100644
--- a/client/src/com/vaadin/terminal/gwt/client/SuperDevMode.java
+++ b/client/src/com/vaadin/client/SuperDevMode.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.JavaScriptObject;
@@ -22,9 +22,9 @@ import com.google.gwt.jsonp.client.JsonpRequestBuilder;
 import com.google.gwt.storage.client.Storage;
 import com.google.gwt.user.client.Window.Location;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
-import com.vaadin.terminal.gwt.client.ui.notification.VNotification.EventListener;
-import com.vaadin.terminal.gwt.client.ui.notification.VNotification.HideEvent;
+import com.vaadin.client.ui.notification.VNotification;
+import com.vaadin.client.ui.notification.VNotification.EventListener;
+import com.vaadin.client.ui.notification.VNotification.HideEvent;
 
 /**
  * Class that enables SuperDevMode using a ?superdevmode parameter in the url.
diff --git a/client/src/com/vaadin/terminal/gwt/client/SynchronousXHR.java b/client/src/com/vaadin/client/SynchronousXHR.java
index a0a399842a..687879103c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/SynchronousXHR.java
+++ b/client/src/com/vaadin/client/SynchronousXHR.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.xhr.client.XMLHttpRequest;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/TooltipInfo.java b/client/src/com/vaadin/client/TooltipInfo.java
index e0a398b90d..05781e9a94 100644
--- a/client/src/com/vaadin/terminal/gwt/client/TooltipInfo.java
+++ b/client/src/com/vaadin/client/TooltipInfo.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 public class TooltipInfo {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/UIDL.java b/client/src/com/vaadin/client/UIDL.java
index 9032a04e24..f9cad3dee5 100644
--- a/client/src/com/vaadin/terminal/gwt/client/UIDL.java
+++ b/client/src/com/vaadin/client/UIDL.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -22,7 +22,7 @@ import java.util.Set;
 
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.JsArrayString;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintTarget;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Component;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/Util.java b/client/src/com/vaadin/client/Util.java
index 96344f0792..f0caf4772f 100644
--- a/client/src/com/vaadin/terminal/gwt/client/Util.java
+++ b/client/src/com/vaadin/client/Util.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,11 +39,11 @@ import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.RenderInformation.FloatSize;
+import com.vaadin.client.ui.VOverlay;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.communication.MethodInvocation;
-import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
 
 public class Util {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/VCaption.java b/client/src/com/vaadin/client/VCaption.java
index d6da84eb8c..58e0b847f0 100644
--- a/client/src/com/vaadin/terminal/gwt/client/VCaption.java
+++ b/client/src/com/vaadin/client/VCaption.java
@@ -14,16 +14,17 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.HTML;
+import com.vaadin.client.ui.AbstractFieldConnector;
+import com.vaadin.client.ui.Icon;
 import com.vaadin.shared.AbstractFieldState;
+import com.vaadin.shared.ComponentConstants;
 import com.vaadin.shared.ComponentState;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.Icon;
 
 public class VCaption extends HTML {
 
@@ -119,7 +120,8 @@ public class VCaption extends HTML {
         }
         setStyleName(style);
 
-        boolean hasIcon = owner.getState().getIcon() != null;
+        boolean hasIcon = owner.getState().resources
+                .containsKey(ComponentConstants.ICON_RESOURCE);
         boolean showRequired = false;
         boolean showError = owner.getState().getErrorMessage() != null;
         if (owner.getState() instanceof AbstractFieldState) {
@@ -143,7 +145,8 @@ public class VCaption extends HTML {
             // Icon forces the caption to be above the component
             placedAfterComponent = false;
 
-            icon.setUri(owner.getState().getIcon().getURL());
+            icon.setUri(owner.getState().resources.get(
+                    ComponentConstants.ICON_RESOURCE).getURL());
 
         } else if (icon != null) {
             // Remove existing
@@ -392,7 +395,7 @@ public class VCaption extends HTML {
         if (state.getCaption() != null) {
             return true;
         }
-        if (state.getIcon() != null) {
+        if (state.resources.containsKey(ComponentConstants.ICON_RESOURCE)) {
             return true;
         }
         if (state.getErrorMessage() != null) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/VCaptionWrapper.java b/client/src/com/vaadin/client/VCaptionWrapper.java
index f3e1802689..4701a8762e 100644
--- a/client/src/com/vaadin/terminal/gwt/client/VCaptionWrapper.java
+++ b/client/src/com/vaadin/client/VCaptionWrapper.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.user.client.ui.FlowPanel;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/VConsole.java b/client/src/com/vaadin/client/VConsole.java
index 73427c5beb..dfd9e34306 100644
--- a/client/src/com/vaadin/terminal/gwt/client/VConsole.java
+++ b/client/src/com/vaadin/client/VConsole.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Set;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/VDebugConsole.java b/client/src/com/vaadin/client/VDebugConsole.java
index 022171f2bb..bdb24066ca 100644
--- a/client/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
+++ b/client/src/com/vaadin/client/VDebugConsole.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Collection;
 import java.util.Date;
@@ -67,12 +67,12 @@ import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ui.VLazyExecutor;
+import com.vaadin.client.ui.VOverlay;
+import com.vaadin.client.ui.UI.UIConnector;
+import com.vaadin.client.ui.notification.VNotification;
+import com.vaadin.client.ui.window.WindowConnector;
 import com.vaadin.shared.Version;
-import com.vaadin.terminal.gwt.client.ui.VLazyExecutor;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
-import com.vaadin.terminal.gwt.client.ui.UI.UIConnector;
-import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
-import com.vaadin.terminal.gwt.client.ui.window.WindowConnector;
 
 /**
  * A helper console for client side development. The debug console can also be
@@ -359,7 +359,7 @@ public class VDebugConsole extends VOverlay implements Console {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.Console#log(java.lang.String)
+     * @see com.vaadin.client.Console#log(java.lang.String)
      */
     @Override
     public void log(String msg) {
@@ -455,7 +455,7 @@ public class VDebugConsole extends VOverlay implements Console {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.Console#error(java.lang.String)
+     * @see com.vaadin.client.Console#error(java.lang.String)
      */
     @Override
     public void error(String msg) {
@@ -483,8 +483,7 @@ public class VDebugConsole extends VOverlay implements Console {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.Console#printObject(java.lang.
-     * Object)
+     * @see com.vaadin.client.Console#printObject(java.lang. Object)
      */
     @Override
     public void printObject(Object msg) {
@@ -501,8 +500,7 @@ public class VDebugConsole extends VOverlay implements Console {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.Console#dirUIDL(com.vaadin
-     * .terminal.gwt.client.UIDL)
+     * @see com.vaadin.client.Console#dirUIDL(com.vaadin.client.UIDL)
      */
     @Override
     public void dirUIDL(ValueMap u, ApplicationConnection client) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/VErrorMessage.java b/client/src/com/vaadin/client/VErrorMessage.java
index af94241361..3e3807a5da 100644
--- a/client/src/com/vaadin/terminal/gwt/client/VErrorMessage.java
+++ b/client/src/com/vaadin/client/VErrorMessage.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
+import com.vaadin.client.ui.VOverlay;
 
 public class VErrorMessage extends FlowPanel {
     public static final String CLASSNAME = "v-errormessage";
diff --git a/client/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java b/client/src/com/vaadin/client/VSchedulerImpl.java
index 56dec16289..aba58cb0c0 100644
--- a/client/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java
+++ b/client/src/com/vaadin/client/VSchedulerImpl.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.core.client.impl.SchedulerImpl;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/VTooltip.java b/client/src/com/vaadin/client/VTooltip.java
index 1b9321fb16..8de559264d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/VTooltip.java
+++ b/client/src/com/vaadin/client/VTooltip.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -29,7 +29,7 @@ import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
+import com.vaadin.client.ui.VOverlay;
 
 /**
  * TODO open for extension
diff --git a/client/src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java b/client/src/com/vaadin/client/VUIDLBrowser.java
index 3cdc03ee86..4f165d6233 100644
--- a/client/src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java
+++ b/client/src/com/vaadin/client/VUIDLBrowser.java
@@ -16,7 +16,7 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Iterator;
 import java.util.Set;
@@ -38,9 +38,9 @@ import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONValue;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ui.UnknownComponentConnector;
+import com.vaadin.client.ui.window.VWindow;
 import com.vaadin.shared.Connector;
-import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.window.VWindow;
 
 /**
  * TODO Rename to something more Vaadin7-ish?
diff --git a/client/src/com/vaadin/terminal/gwt/client/ValueMap.java b/client/src/com/vaadin/client/ValueMap.java
index bade480e7c..fb22a50807 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ValueMap.java
+++ b/client/src/com/vaadin/client/ValueMap.java
@@ -16,7 +16,7 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/client/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java b/client/src/com/vaadin/client/WidgetInstantiator.java
index 347a8dd631..3bbd144ac8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java
+++ b/client/src/com/vaadin/client/WidgetInstantiator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 /**
  * A helper class used by WidgetMap implementation. Used by the generated code.
diff --git a/client/src/com/vaadin/terminal/gwt/client/WidgetLoader.java b/client/src/com/vaadin/client/WidgetLoader.java
index e98aa031c4..1b69d6747c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/WidgetLoader.java
+++ b/client/src/com/vaadin/client/WidgetLoader.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.core.client.RunAsyncCallback;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/WidgetMap.java b/client/src/com/vaadin/client/WidgetMap.java
index 4c929714c3..6cabf4add0 100644
--- a/client/src/com/vaadin/terminal/gwt/client/WidgetMap.java
+++ b/client/src/com/vaadin/client/WidgetMap.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.HashMap;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/WidgetSet.java b/client/src/com/vaadin/client/WidgetSet.java
index 8245371161..510d222ac8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/WidgetSet.java
+++ b/client/src/com/vaadin/client/WidgetSet.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.core.client.GWT;
-import com.vaadin.terminal.gwt.client.communication.HasJavaScriptConnectorHelper;
-import com.vaadin.terminal.gwt.client.metadata.BundleLoadCallback;
-import com.vaadin.terminal.gwt.client.metadata.ConnectorBundleLoader;
-import com.vaadin.terminal.gwt.client.metadata.NoDataException;
-import com.vaadin.terminal.gwt.client.metadata.TypeData;
-import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
+import com.vaadin.client.communication.HasJavaScriptConnectorHelper;
+import com.vaadin.client.metadata.BundleLoadCallback;
+import com.vaadin.client.metadata.ConnectorBundleLoader;
+import com.vaadin.client.metadata.NoDataException;
+import com.vaadin.client.metadata.TypeData;
+import com.vaadin.client.ui.UnknownComponentConnector;
 
 public class WidgetSet {
     /**
diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/AbstractServerConnectorEvent.java b/client/src/com/vaadin/client/communication/AbstractServerConnectorEvent.java
index 7b4114ec07..9734c253c4 100644
--- a/client/src/com/vaadin/terminal/gwt/client/communication/AbstractServerConnectorEvent.java
+++ b/client/src/com/vaadin/client/communication/AbstractServerConnectorEvent.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
 import com.google.gwt.event.shared.EventHandler;
 import com.google.gwt.event.shared.GwtEvent;
-import com.vaadin.terminal.gwt.client.ServerConnector;
+import com.vaadin.client.ServerConnector;
 
 public abstract class AbstractServerConnectorEvent<H extends EventHandler>
         extends GwtEvent<H> {
diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/DiffJSONSerializer.java b/client/src/com/vaadin/client/communication/DiffJSONSerializer.java
index 1d5415263f..040e6e6c90 100644
--- a/client/src/com/vaadin/terminal/gwt/client/communication/DiffJSONSerializer.java
+++ b/client/src/com/vaadin/client/communication/DiffJSONSerializer.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
 import com.google.gwt.json.client.JSONValue;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.metadata.Type;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.metadata.Type;
 
 public interface DiffJSONSerializer<T> extends JSONSerializer<T> {
     /**
diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/HasJavaScriptConnectorHelper.java b/client/src/com/vaadin/client/communication/HasJavaScriptConnectorHelper.java
index 1c8a96a814..385c3bc380 100644
--- a/client/src/com/vaadin/terminal/gwt/client/communication/HasJavaScriptConnectorHelper.java
+++ b/client/src/com/vaadin/client/communication/HasJavaScriptConnectorHelper.java
@@ -14,9 +14,9 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
-import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper;
+import com.vaadin.client.JavaScriptConnectorHelper;
 
 public interface HasJavaScriptConnectorHelper {
     public JavaScriptConnectorHelper getJavascriptConnectorHelper();
diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/JSONSerializer.java b/client/src/com/vaadin/client/communication/JSONSerializer.java
index c6b814a5c1..dd3594acac 100644
--- a/client/src/com/vaadin/terminal/gwt/client/communication/JSONSerializer.java
+++ b/client/src/com/vaadin/client/communication/JSONSerializer.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONValue;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.metadata.Type;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.metadata.Type;
 
 /**
  * Implementors of this interface knows how to serialize an Object of a given
@@ -41,7 +41,7 @@ public interface JSONSerializer<T> {
      * Creates and deserializes an object received from the server. Must be
      * compatible with {@link #serialize(Object, ConnectorMap)} and also with
      * the server side JsonCodec.encode(Object,
-     * com.vaadin.terminal.gwt.server.PaintableIdMapper) .
+     * com.vaadin.server.PaintableIdMapper) .
      * 
      * @param jsonValue
      *            JSON map from property name to property value
@@ -54,7 +54,7 @@ public interface JSONSerializer<T> {
      * Serialize the given object into JSON. Must be compatible with
      * {@link #deserialize(JSONObject, ConnectorMap)} and also with the server
      * side JsonCodec.decode(com.vaadin.external.json.JSONArray,
-     * com.vaadin.terminal.gwt.server.PaintableIdMapper)
+     * com.vaadin.server.PaintableIdMapper)
      * 
      * @param value
      *            The object to serialize
diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java b/client/src/com/vaadin/client/communication/JsonDecoder.java
index a98d08c368..1a745a7c14 100644
--- a/client/src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java
+++ b/client/src/com/vaadin/client/communication/JsonDecoder.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,12 +28,12 @@ import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
 import com.google.gwt.json.client.JSONValue;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.metadata.NoDataException;
+import com.vaadin.client.metadata.Property;
+import com.vaadin.client.metadata.Type;
 import com.vaadin.shared.Connector;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.metadata.NoDataException;
-import com.vaadin.terminal.gwt.client.metadata.Property;
-import com.vaadin.terminal.gwt.client.metadata.Type;
 
 /**
  * Client side decoder for decodeing shared state and other values from JSON
diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java b/client/src/com/vaadin/client/communication/JsonEncoder.java
index 9b28da8b34..07908c8147 100644
--- a/client/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java
+++ b/client/src/com/vaadin/client/communication/JsonEncoder.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
 import java.util.Collection;
 import java.util.List;
@@ -29,13 +29,13 @@ import com.google.gwt.json.client.JSONNumber;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
 import com.google.gwt.json.client.JSONValue;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.metadata.NoDataException;
+import com.vaadin.client.metadata.Property;
+import com.vaadin.client.metadata.Type;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.JsonConstants;
 import com.vaadin.shared.communication.UidlValue;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.metadata.NoDataException;
-import com.vaadin.terminal.gwt.client.metadata.Property;
-import com.vaadin.terminal.gwt.client.metadata.Type;
 
 /**
  * Encoder for converting RPC parameters and other values to JSON for transfer
diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/RpcManager.java b/client/src/com/vaadin/client/communication/RpcManager.java
index 5b9bcff6a4..df0359ed78 100644
--- a/client/src/com/vaadin/terminal/gwt/client/communication/RpcManager.java
+++ b/client/src/com/vaadin/client/communication/RpcManager.java
@@ -14,21 +14,21 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
 import java.util.Collection;
 
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONString;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.metadata.Method;
+import com.vaadin.client.metadata.NoDataException;
+import com.vaadin.client.metadata.Type;
 import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.MethodInvocation;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.ServerConnector;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.metadata.Method;
-import com.vaadin.terminal.gwt.client.metadata.NoDataException;
-import com.vaadin.terminal.gwt.client.metadata.Type;
 
 /**
  * Client side RPC manager that can invoke methods based on RPC calls received
diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/RpcProxy.java b/client/src/com/vaadin/client/communication/RpcProxy.java
index e9dc6ab7fd..0e53ea0013 100644
--- a/client/src/com/vaadin/terminal/gwt/client/communication/RpcProxy.java
+++ b/client/src/com/vaadin/client/communication/RpcProxy.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.metadata.InvokationHandler;
+import com.vaadin.client.metadata.Method;
+import com.vaadin.client.metadata.NoDataException;
+import com.vaadin.client.metadata.TypeData;
 import com.vaadin.shared.communication.MethodInvocation;
 import com.vaadin.shared.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.ServerConnector;
-import com.vaadin.terminal.gwt.client.metadata.InvokationHandler;
-import com.vaadin.terminal.gwt.client.metadata.Method;
-import com.vaadin.terminal.gwt.client.metadata.NoDataException;
-import com.vaadin.terminal.gwt.client.metadata.TypeData;
 
 /**
  * Class for creating proxy instances for Client to Server RPC.
diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/StateChangeEvent.java b/client/src/com/vaadin/client/communication/StateChangeEvent.java
index 8ed32bc94b..73a2e4146e 100644
--- a/client/src/com/vaadin/terminal/gwt/client/communication/StateChangeEvent.java
+++ b/client/src/com/vaadin/client/communication/StateChangeEvent.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Set;
 
 import com.google.gwt.event.shared.EventHandler;
-import com.vaadin.terminal.gwt.client.ServerConnector;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler;
 
 public class StateChangeEvent extends
         AbstractServerConnectorEvent<StateChangeHandler> {
diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java b/client/src/com/vaadin/client/communication/URLReference_Serializer.java
index 3d2e4f3804..f004980e56 100644
--- a/client/src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java
+++ b/client/src/com/vaadin/client/communication/URLReference_Serializer.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONValue;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.metadata.Type;
 import com.vaadin.shared.communication.URLReference;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.metadata.Type;
 
 public class URLReference_Serializer implements JSONSerializer<URLReference> {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/extensions/AbstractExtensionConnector.java b/client/src/com/vaadin/client/extensions/AbstractExtensionConnector.java
index dabbfe22f0..a007e15357 100644
--- a/client/src/com/vaadin/terminal/gwt/client/extensions/AbstractExtensionConnector.java
+++ b/client/src/com/vaadin/client/extensions/AbstractExtensionConnector.java
@@ -14,10 +14,10 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.extensions;
+package com.vaadin.client.extensions;
 
-import com.vaadin.terminal.gwt.client.ServerConnector;
-import com.vaadin.terminal.gwt.client.ui.AbstractConnector;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.ui.AbstractConnector;
 
 public abstract class AbstractExtensionConnector extends AbstractConnector {
     boolean hasBeenAttached = false;
diff --git a/client/src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java b/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java
index 46578b0641..7cab90a90d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java
+++ b/client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.extensions.javascriptmanager;
+package com.vaadin.client.extensions.javascriptmanager;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -22,12 +22,12 @@ import java.util.Set;
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.JsArray;
 import com.google.gwt.json.client.JSONArray;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.extensions.AbstractExtensionConnector;
 import com.vaadin.shared.communication.MethodInvocation;
 import com.vaadin.shared.extension.javascriptmanager.ExecuteJavaScriptRpc;
 import com.vaadin.shared.extension.javascriptmanager.JavaScriptManagerState;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector;
 import com.vaadin.ui.JavaScript;
 
 @Connect(JavaScript.class)
@@ -81,7 +81,7 @@ public class JavaScriptManagerConnector extends AbstractExtensionConnector {
         target[parts[parts.length - 1]] = $entry(function() {
             //Must make a copy because arguments is an array-like object (not instanceof Array), causing suboptimal JSON encoding
             var args = Array.prototype.slice.call(arguments, 0);
-            m.@com.vaadin.terminal.gwt.client.extensions.javascriptmanager.JavaScriptManagerConnector::sendRpc(Ljava/lang/String;Lcom/google/gwt/core/client/JsArray;)(name, args);
+            m.@com.vaadin.client.extensions.javascriptmanager.JavaScriptManagerConnector::sendRpc(Ljava/lang/String;Lcom/google/gwt/core/client/JsArray;)(name, args);
         });
     }-*/;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/AsyncBundleLoader.java b/client/src/com/vaadin/client/metadata/AsyncBundleLoader.java
index e92e51b40d..7bbd93c6e3 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/AsyncBundleLoader.java
+++ b/client/src/com/vaadin/client/metadata/AsyncBundleLoader.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/BundleLoadCallback.java b/client/src/com/vaadin/client/metadata/BundleLoadCallback.java
index c7fc735829..8e9d454ab5 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/BundleLoadCallback.java
+++ b/client/src/com/vaadin/client/metadata/BundleLoadCallback.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public interface BundleLoadCallback {
     public void loaded();
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/ConnectorBundleLoader.java b/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java
index ab1462efc1..7d6c209ebf 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/ConnectorBundleLoader.java
+++ b/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java
@@ -2,14 +2,14 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import com.google.gwt.core.shared.GWT;
-import com.vaadin.terminal.gwt.client.metadata.AsyncBundleLoader.State;
+import com.vaadin.client.metadata.AsyncBundleLoader.State;
 
 public abstract class ConnectorBundleLoader {
     public static final String EAGER_BUNDLE_NAME = "__eager";
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/InvokationHandler.java b/client/src/com/vaadin/client/metadata/InvokationHandler.java
index 2b1153ad97..1c7b5366df 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/InvokationHandler.java
+++ b/client/src/com/vaadin/client/metadata/InvokationHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public interface InvokationHandler {
     public Object invoke(Object target, Method method, Object[] params);
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/Invoker.java b/client/src/com/vaadin/client/metadata/Invoker.java
index 33e8776429..586864e685 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/Invoker.java
+++ b/client/src/com/vaadin/client/metadata/Invoker.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public interface Invoker {
     public Object invoke(Object target, Object... params);
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/Method.java b/client/src/com/vaadin/client/metadata/Method.java
index 527e8a29d2..902205cea1 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/Method.java
+++ b/client/src/com/vaadin/client/metadata/Method.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public class Method {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/NoDataException.java b/client/src/com/vaadin/client/metadata/NoDataException.java
index 717b92edaf..9d6ffcbbca 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/NoDataException.java
+++ b/client/src/com/vaadin/client/metadata/NoDataException.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public class NoDataException extends Exception {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/Property.java b/client/src/com/vaadin/client/metadata/Property.java
index 69e41ce75d..05ccb02626 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/Property.java
+++ b/client/src/com/vaadin/client/metadata/Property.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 import com.vaadin.shared.annotations.DelegateToWidget;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/ProxyHandler.java b/client/src/com/vaadin/client/metadata/ProxyHandler.java
index cc8168a8ff..aa816e1a97 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/ProxyHandler.java
+++ b/client/src/com/vaadin/client/metadata/ProxyHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public interface ProxyHandler {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/Type.java b/client/src/com/vaadin/client/metadata/Type.java
index d019ff27e0..7bfdb48e59 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/Type.java
+++ b/client/src/com/vaadin/client/metadata/Type.java
@@ -1,11 +1,11 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 import java.util.Collection;
 
-import com.vaadin.terminal.gwt.client.communication.JSONSerializer;
+import com.vaadin.client.communication.JSONSerializer;
 
 public class Type {
     private final String name;
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/TypeData.java b/client/src/com/vaadin/client/metadata/TypeData.java
index ec2a8f191c..ed9767a4ce 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/TypeData.java
+++ b/client/src/com/vaadin/client/metadata/TypeData.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public class TypeData {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/TypeDataBundle.java b/client/src/com/vaadin/client/metadata/TypeDataBundle.java
index cbde338ff2..158672e3a6 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/TypeDataBundle.java
+++ b/client/src/com/vaadin/client/metadata/TypeDataBundle.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 import com.google.gwt.core.client.RunAsyncCallback;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/metadata/TypeDataStore.java b/client/src/com/vaadin/client/metadata/TypeDataStore.java
index 0fc8f3b3bf..16047baadc 100644
--- a/client/src/com/vaadin/terminal/gwt/client/metadata/TypeDataStore.java
+++ b/client/src/com/vaadin/client/metadata/TypeDataStore.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -11,7 +11,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.vaadin.terminal.gwt.client.communication.JSONSerializer;
+import com.vaadin.client.communication.JSONSerializer;
 
 public class TypeDataStore {
     private static final String CONSTRUCTOR_NAME = "!new";
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java b/client/src/com/vaadin/client/ui/AbstractClickEventHandler.java
index e7060f1c6d..caeb506846 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java
+++ b/client/src/com/vaadin/client/ui/AbstractClickEventHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.dom.client.NativeEvent;
@@ -32,8 +32,8 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Event.NativePreviewEvent;
 import com.google.gwt.user.client.Event.NativePreviewHandler;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.Util;
 
 public abstract class AbstractClickEventHandler implements MouseDownHandler,
         MouseUpHandler, DoubleClickHandler, ContextMenuHandler {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
index b0ad12adde..c886d2f94c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,25 +23,26 @@ import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.ui.Focusable;
 import com.google.gwt.user.client.ui.HasEnabled;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ComponentContainerConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.TooltipInfo;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.metadata.NoDataException;
+import com.vaadin.client.metadata.Type;
+import com.vaadin.client.metadata.TypeData;
+import com.vaadin.client.ui.UI.UIConnector;
+import com.vaadin.client.ui.datefield.PopupDateFieldConnector;
+import com.vaadin.shared.ComponentConstants;
 import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.TabIndexState;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.ServerConnector;
-import com.vaadin.terminal.gwt.client.TooltipInfo;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.metadata.NoDataException;
-import com.vaadin.terminal.gwt.client.metadata.Type;
-import com.vaadin.terminal.gwt.client.metadata.TypeData;
-import com.vaadin.terminal.gwt.client.ui.UI.UIConnector;
-import com.vaadin.terminal.gwt.client.ui.datefield.PopupDateFieldConnector;
 import com.vaadin.ui.themes.BaseTheme;
 
 public abstract class AbstractComponentConnector extends AbstractConnector
@@ -249,9 +250,7 @@ implements ComponentConnector {
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.gwt.client.ComponentConnector#delegateCaptionHandling
-     * ()
+     * @see com.vaadin.client.ComponentConnector#delegateCaptionHandling ()
      */
     @Override
     public boolean delegateCaptionHandling() {
@@ -370,7 +369,7 @@ implements ComponentConnector {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.ComponentConnector#isReadOnly()
+     * @see com.vaadin.client.ComponentConnector#isReadOnly()
      */
     @Override
     @Deprecated
@@ -422,8 +421,7 @@ implements ComponentConnector {
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.gwt.client.ComponentConnector#getTooltipInfo(com.
+     * @see com.vaadin.client.ComponentConnector#getTooltipInfo(com.
      * google.gwt.dom.client.Element)
      */
     @Override
@@ -431,4 +429,14 @@ implements ComponentConnector {
         return new TooltipInfo(getState().getDescription(), getState()
                 .getErrorMessage());
     }
+
+    /**
+     * Gets the icon set for this component.
+     * 
+     * @return the URL of the icon, or <code>null</code> if no icon has been
+     *         defined.
+     */
+    protected String getIcon() {
+        return getResourceUrl(ComponentConstants.ICON_RESOURCE);
+    }
 }
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
index 16eab60a75..59adca1ca8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import java.util.Collections;
 import java.util.List;
 
 import com.google.gwt.event.shared.HandlerRegistration;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VConsole;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ComponentContainerConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler;
 
 public abstract class AbstractComponentContainerConnector extends
         AbstractComponentConnector implements ComponentContainerConnector,
@@ -44,8 +44,7 @@ public abstract class AbstractComponentContainerConnector extends
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.gwt.client.ComponentContainerConnector#getChildren()
+     * @see com.vaadin.client.ComponentContainerConnector#getChildren()
      */
     @Override
     public List<ComponentConnector> getChildComponents() {
@@ -59,8 +58,7 @@ public abstract class AbstractComponentContainerConnector extends
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.gwt.client.ComponentContainerConnector#setChildren
+     * @see com.vaadin.client.ComponentContainerConnector#setChildren
      * (java.util.Collection)
      */
     @Override
@@ -71,9 +69,9 @@ public abstract class AbstractComponentContainerConnector extends
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.ComponentContainerConnector#
+     * @see com.vaadin.client.ComponentContainerConnector#
      * connectorHierarchyChanged
-     * (com.vaadin.terminal.gwt.client.ConnectorHierarchyChangedEvent)
+     * (com.vaadin.client.ConnectorHierarchyChangedEvent)
      */
     @Override
     public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java b/client/src/com/vaadin/client/ui/AbstractConnector.java
index 69b3b47338..2820b7b2c1 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,17 +25,18 @@ import java.util.Map;
 import com.google.gwt.event.shared.GwtEvent;
 import com.google.gwt.event.shared.HandlerManager;
 import com.google.web.bindery.event.shared.HandlerRegistration;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler;
+import com.vaadin.client.metadata.NoDataException;
+import com.vaadin.client.metadata.Type;
+import com.vaadin.client.metadata.TypeData;
 import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.SharedState;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ServerConnector;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
-import com.vaadin.terminal.gwt.client.metadata.NoDataException;
-import com.vaadin.terminal.gwt.client.metadata.Type;
-import com.vaadin.terminal.gwt.client.metadata.TypeData;
+import com.vaadin.shared.communication.URLReference;
 
 /**
  * An abstract implementation of Connector.
@@ -70,7 +71,7 @@ StateChangeHandler {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.VPaintable#getConnection()
+     * @see com.vaadin.client.VPaintable#getConnection()
      */
     @Override
     public final ApplicationConnection getConnection() {
@@ -80,7 +81,7 @@ StateChangeHandler {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.Connector#getId()
+     * @see com.vaadin.client.Connector#getId()
      */
     @Override
     public String getConnectorId() {
@@ -244,7 +245,7 @@ StateChangeHandler {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.ServerConnector#onUnregister()
+     * @see com.vaadin.client.ServerConnector#onUnregister()
      */
     @Override
     public void onUnregister() {
@@ -356,4 +357,29 @@ StateChangeHandler {
             c.updateEnabledState(c.isEnabled());
         }
     }
+
+    /**
+     * Gets the URL for a resource that has been added by the server-side
+     * connector using
+     * {@link com.vaadin.terminal.AbstractClientConnector#setResource(String, com.vaadin.terminal.Resource)}
+     * with the same key. <code>null</code> is returned if no corresponding
+     * resource is found.
+     * <p>
+     * To get an event when a resource changes, you can use
+     * {@link #addStateChangeHandler(String, StateChangeHandler)} with
+     * <code>resources.[key]</code> as the property name.
+     * 
+     * @param key
+     *            a string identifying the resource.
+     * @return the resource URL as a string, or <code>null</code> if no
+     *         corresponding resource is found.
+     */
+    public String getResourceUrl(String key) {
+        URLReference urlReference = getState().resources.get(key);
+        if (urlReference == null) {
+            return null;
+        } else {
+            return urlReference.getURL();
+        }
+    }
 }
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractFieldConnector.java b/client/src/com/vaadin/client/ui/AbstractFieldConnector.java
index c007eb8529..9a6f285187 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractFieldConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractFieldConnector.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
+import com.vaadin.client.ApplicationConnection;
 import com.vaadin.shared.AbstractFieldState;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
 
 public abstract class AbstractFieldConnector extends AbstractComponentConnector {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java b/client/src/com/vaadin/client/ui/AbstractLayoutConnector.java
index b8a16d697d..a35a257d15 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractLayoutConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.vaadin.shared.ui.AbstractLayoutState;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/Action.java b/client/src/com/vaadin/client/ui/Action.java
index b97599c872..637525f0a8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/Action.java
+++ b/client/src/com/vaadin/client/ui/Action.java
@@ -14,10 +14,10 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.user.client.Command;
-import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.client.Util;
 
 /**
  * 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/ActionOwner.java b/client/src/com/vaadin/client/ui/ActionOwner.java
index bb714d1081..5c5a18c090 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/ActionOwner.java
+++ b/client/src/com/vaadin/client/ui/ActionOwner.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.client.ApplicationConnection;
 
 public interface ActionOwner {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/CalendarEntry.java b/client/src/com/vaadin/client/ui/CalendarEntry.java
index 72c7bea806..dc302414d2 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/CalendarEntry.java
+++ b/client/src/com/vaadin/client/ui/CalendarEntry.java
@@ -14,11 +14,11 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import java.util.Date;
 
-import com.vaadin.terminal.gwt.client.DateTimeService;
+import com.vaadin.client.DateTimeService;
 
 public class CalendarEntry {
     private final String styleName;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java b/client/src/com/vaadin/client/ui/ClickEventHandler.java
index 5614837615..7252e6bb13 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java
+++ b/client/src/com/vaadin/client/ui/ClickEventHandler.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.dom.client.NativeEvent;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.MouseEventDetailsBuilder;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
 
 public abstract class ClickEventHandler extends AbstractClickEventHandler {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/Field.java b/client/src/com/vaadin/client/ui/Field.java
index b81e365608..73a18f9ab2 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/Field.java
+++ b/client/src/com/vaadin/client/ui/Field.java
@@ -16,7 +16,7 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 /**
  * This interface indicates that the component is a Field (serverside), and
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java b/client/src/com/vaadin/client/ui/FocusElementPanel.java
index 6a86ab5679..2f0b54423e 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java
+++ b/client/src/com/vaadin/client/ui/FocusElementPanel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.Document;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java b/client/src/com/vaadin/client/ui/FocusableFlexTable.java
index 8ad7002a79..039c83015f 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/FocusableFlexTable.java
+++ b/client/src/com/vaadin/client/ui/FocusableFlexTable.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.BlurHandler;
@@ -30,7 +30,7 @@ import com.google.gwt.event.dom.client.KeyPressHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.ui.FlexTable;
 import com.google.gwt.user.client.ui.impl.FocusImpl;
-import com.vaadin.terminal.gwt.client.Focusable;
+import com.vaadin.client.Focusable;
 
 /**
  * Adds keyboard focus to {@link FlexPanel}.
@@ -113,7 +113,7 @@ public class FocusableFlexTable extends FlexTable implements HasFocusHandlers,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.Focusable#focus()
+     * @see com.vaadin.client.Focusable#focus()
      */
     @Override
     public void focus() {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java b/client/src/com/vaadin/client/ui/FocusableFlowPanel.java
index c162a750ce..a36687013d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/FocusableFlowPanel.java
+++ b/client/src/com/vaadin/client/ui/FocusableFlowPanel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.BlurHandler;
@@ -30,7 +30,7 @@ import com.google.gwt.event.dom.client.KeyPressHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.impl.FocusImpl;
-import com.vaadin.terminal.gwt.client.Focusable;
+import com.vaadin.client.Focusable;
 
 public class FocusableFlowPanel extends FlowPanel implements HasFocusHandlers,
         HasBlurHandlers, HasKeyDownHandlers, HasKeyPressHandlers, Focusable {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java b/client/src/com/vaadin/client/ui/FocusableScrollPanel.java
index d20b3e9e65..99254db4c2 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java
+++ b/client/src/com/vaadin/client/ui/FocusableScrollPanel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import java.util.ArrayList;
 
@@ -35,7 +35,7 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.impl.FocusImpl;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.client.BrowserInfo;
 
 /**
  * A scrollhandlers similar to {@link ScrollPanel}.
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/Icon.java b/client/src/com/vaadin/client/ui/Icon.java
index 21ee5bea93..f3296e92ad 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/Icon.java
+++ b/client/src/com/vaadin/client/ui/Icon.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.UIObject;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.client.ApplicationConnection;
 
 public class Icon extends UIObject {
     public static final String CLASSNAME = "v-icon";
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java b/client/src/com/vaadin/client/ui/JavaScriptComponentConnector.java
index 4ab7c45161..82ab32e23e 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java
+++ b/client/src/com/vaadin/client/ui/JavaScriptComponentConnector.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
+import com.vaadin.client.JavaScriptConnectorHelper;
+import com.vaadin.client.communication.HasJavaScriptConnectorHelper;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.JavaScriptComponentState;
-import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper;
-import com.vaadin.terminal.gwt.client.communication.HasJavaScriptConnectorHelper;
 import com.vaadin.ui.AbstractJavaScriptComponent;
 
 @Connect(AbstractJavaScriptComponent.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/JavaScriptWidget.java b/client/src/com/vaadin/client/ui/JavaScriptWidget.java
index 8e59115671..0ea0bf5ec6 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/JavaScriptWidget.java
+++ b/client/src/com/vaadin/client/ui/JavaScriptWidget.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import java.util.ArrayList;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java b/client/src/com/vaadin/client/ui/LayoutClickEventHandler.java
index 63c3c84ce4..99c5ccbd19 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java
+++ b/client/src/com/vaadin/client/ui/LayoutClickEventHandler.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.user.client.Element;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.MouseEventDetailsBuilder;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.LayoutClickRpc;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
 
 public abstract class LayoutClickEventHandler extends AbstractClickEventHandler {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/ManagedLayout.java b/client/src/com/vaadin/client/ui/ManagedLayout.java
index bdb01113d6..6f6190c712 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/ManagedLayout.java
+++ b/client/src/com/vaadin/client/ui/ManagedLayout.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
-import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.client.ComponentConnector;
 
 public interface ManagedLayout extends ComponentConnector {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java b/client/src/com/vaadin/client/ui/MediaBaseConnector.java
index 33d97f4ed8..8a17e052ba 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java
+++ b/client/src/com/vaadin/client/ui/MediaBaseConnector.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
+import com.vaadin.client.Util;
+import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.shared.communication.URLReference;
 import com.vaadin.shared.ui.AbstractMediaState;
 import com.vaadin.shared.ui.MediaControl;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 
 public abstract class MediaBaseConnector extends AbstractComponentConnector {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/PostLayoutListener.java b/client/src/com/vaadin/client/ui/PostLayoutListener.java
index a56c464ad2..25282df69d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/PostLayoutListener.java
+++ b/client/src/com/vaadin/client/ui/PostLayoutListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 public interface PostLayoutListener {
     public void postLayout();
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java b/client/src/com/vaadin/client/ui/ShortcutActionHandler.java
index 65ea7579fd..8dc0d9def7 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java
+++ b/client/src/com/vaadin/client/ui/ShortcutActionHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -27,12 +27,12 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.KeyboardListener;
 import com.google.gwt.user.client.ui.KeyboardListenerCollection;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.richtextarea.VRichTextArea;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.richtextarea.VRichTextArea;
 
 /**
  * A helper class to implement keyboard shorcut handling. Keeps a list of owners
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java b/client/src/com/vaadin/client/ui/SimpleFocusablePanel.java
index d76d6c14f3..807d741d78 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/SimpleFocusablePanel.java
+++ b/client/src/com/vaadin/client/ui/SimpleFocusablePanel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.BlurHandler;
@@ -32,7 +32,7 @@ import com.google.gwt.event.dom.client.KeyUpHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.impl.FocusImpl;
-import com.vaadin.terminal.gwt.client.Focusable;
+import com.vaadin.client.Focusable;
 
 /**
  * Compared to FocusPanel in GWT this panel does not support eg. accesskeys, but
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/SimpleManagedLayout.java b/client/src/com/vaadin/client/ui/SimpleManagedLayout.java
index 1b404b5fb0..0ca2c42680 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/SimpleManagedLayout.java
+++ b/client/src/com/vaadin/client/ui/SimpleManagedLayout.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 public interface SimpleManagedLayout extends ManagedLayout {
     public void layout();
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/SubPartAware.java b/client/src/com/vaadin/client/ui/SubPartAware.java
index 145d03287f..1124c03ade 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/SubPartAware.java
+++ b/client/src/com/vaadin/client/ui/SubPartAware.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ComponentLocator;
+import com.vaadin.client.ComponentLocator;
 
 /**
  * Interface implemented by {@link Widget}s which can provide identifiers for at
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java b/client/src/com/vaadin/client/ui/TouchScrollDelegate.java
index 4838576c41..95ed4c7bbe 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/TouchScrollDelegate.java
+++ b/client/src/com/vaadin/client/ui/TouchScrollDelegate.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -35,8 +35,8 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Event.NativePreviewEvent;
 import com.google.gwt.user.client.Event.NativePreviewHandler;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.VConsole;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.VConsole;
 
 /**
  * Provides one finger touch scrolling for elements with once scrollable
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java b/client/src/com/vaadin/client/ui/TreeAction.java
index 9cf63a609c..876117d7f8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java
+++ b/client/src/com/vaadin/client/ui/TreeAction.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 /**
  * This class is used for "row actions" in VTree and ITable
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/UI/UIConnector.java b/client/src/com/vaadin/client/ui/UI/UIConnector.java
index 4e1bed1aa8..920bf152f9 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/UI/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/UI/UIConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.UI;
+package com.vaadin.client.ui.UI;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -33,6 +33,24 @@ import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.web.bindery.event.shared.HandlerRegistration;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.Focusable;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler;
+import com.vaadin.client.ui.AbstractComponentContainerConnector;
+import com.vaadin.client.ui.ClickEventHandler;
+import com.vaadin.client.ui.ShortcutActionHandler;
+import com.vaadin.client.ui.layout.MayScrollChildren;
+import com.vaadin.client.ui.notification.VNotification;
+import com.vaadin.client.ui.window.WindowConnector;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
@@ -40,29 +58,11 @@ import com.vaadin.shared.ui.ui.PageClientRpc;
 import com.vaadin.shared.ui.ui.UIConstants;
 import com.vaadin.shared.ui.ui.UIServerRpc;
 import com.vaadin.shared.ui.ui.UIState;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
-import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
-import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
-import com.vaadin.terminal.gwt.client.ui.window.WindowConnector;
 import com.vaadin.ui.UI;
 
 @Connect(value = UI.class, loadStyle = LoadStyle.EAGER)
-public class UIConnector extends AbstractComponentContainerConnector
-        implements Paintable, MayScrollChildren {
+public class UIConnector extends AbstractComponentContainerConnector implements
+        Paintable, MayScrollChildren {
 
     private UIServerRpc rpc = RpcProxy.create(UIServerRpc.class, this);
 
@@ -276,8 +276,8 @@ public class UIConnector extends AbstractComponentContainerConnector
 
             // Include current fragment in the next request
             client.updateVariable(getWidget().id,
-                    UIConstants.FRAGMENT_VARIABLE,
-                    getWidget().currentFragment, false);
+                    UIConstants.FRAGMENT_VARIABLE, getWidget().currentFragment,
+                    false);
         }
 
         if (firstPaint) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/UI/VUI.java b/client/src/com/vaadin/client/ui/UI/VUI.java
index 1c4b69a3b9..c99dfebdee 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/UI/VUI.java
+++ b/client/src/com/vaadin/client/ui/UI/VUI.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.UI;
+package com.vaadin.client.ui.UI;
 
 import java.util.ArrayList;
 
@@ -32,20 +32,20 @@ import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.SimplePanel;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.Focusable;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ui.ShortcutActionHandler;
+import com.vaadin.client.ui.TouchScrollDelegate;
+import com.vaadin.client.ui.VLazyExecutor;
+import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler;
+import com.vaadin.client.ui.textfield.VTextField;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate.TouchScrollHandler;
-import com.vaadin.terminal.gwt.client.ui.VLazyExecutor;
-import com.vaadin.terminal.gwt.client.ui.textfield.VTextField;
 
 /**
  *
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java b/client/src/com/vaadin/client/ui/UnknownComponentConnector.java
index aaf37d0345..b8bdd95cc4 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java
+++ b/client/src/com/vaadin/client/ui/UnknownComponentConnector.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 public class UnknownComponentConnector extends AbstractComponentConnector {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java b/client/src/com/vaadin/client/ui/VContextMenu.java
index cf4f772bc9..6b3fc8a560 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java
+++ b/client/src/com/vaadin/client/ui/VContextMenu.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
@@ -43,8 +43,8 @@ import com.google.gwt.user.client.ui.MenuBar;
 import com.google.gwt.user.client.ui.MenuItem;
 import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.impl.FocusImpl;
-import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.client.Focusable;
+import com.vaadin.client.Util;
 
 public class VContextMenu extends VOverlay implements SubPartAware {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/VLazyExecutor.java b/client/src/com/vaadin/client/ui/VLazyExecutor.java
index 85ee27a36a..9b1bc28c0d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/VLazyExecutor.java
+++ b/client/src/com/vaadin/client/ui/VLazyExecutor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.gwt.user.client.Timer;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/VMediaBase.java b/client/src/com/vaadin/client/ui/VMediaBase.java
index 9d83dde3d6..5df1498b75 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/VMediaBase.java
+++ b/client/src/com/vaadin/client/ui/VMediaBase.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.MediaElement;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java b/client/src/com/vaadin/client/ui/VOverlay.java
index 97201de297..6dfcd97516 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java
+++ b/client/src/com/vaadin/client/ui/VOverlay.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.animation.client.Animation;
 import com.google.gwt.dom.client.Document;
@@ -30,7 +30,7 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.client.BrowserInfo;
 
 /**
  * In Vaadin UI this Overlay should always be used for all elements that
@@ -469,17 +469,17 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> {
         if (BrowserInfo.get().isOpera() && isShadowEnabled()) {
             // We'll fix the height of all the middle elements
             DOM.getChild(shadow, 3)
-            .getStyle()
-            .setPropertyPx("height",
-                    DOM.getChild(shadow, 3).getOffsetHeight());
+                    .getStyle()
+                    .setPropertyPx("height",
+                            DOM.getChild(shadow, 3).getOffsetHeight());
             DOM.getChild(shadow, 4)
-            .getStyle()
-            .setPropertyPx("height",
-                    DOM.getChild(shadow, 4).getOffsetHeight());
+                    .getStyle()
+                    .setPropertyPx("height",
+                            DOM.getChild(shadow, 4).getOffsetHeight());
             DOM.getChild(shadow, 5)
-            .getStyle()
-            .setPropertyPx("height",
-                    DOM.getChild(shadow, 5).getOffsetHeight());
+                    .getStyle()
+                    .setPropertyPx("height",
+                            DOM.getChild(shadow, 5).getOffsetHeight());
         }
 
         // Attach to dom if not there already
@@ -489,7 +489,7 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> {
         }
         if (needsShimElement() && !isShimElementAttached()) {
             RootPanel.get().getElement()
-            .insertBefore(getShimElement(), getElement());
+                    .insertBefore(getShimElement(), getElement());
         }
 
     }
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponent.java b/client/src/com/vaadin/client/ui/VUnknownComponent.java
index f4c925a313..860352901a 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/VUnknownComponent.java
+++ b/client/src/com/vaadin/client/ui/VUnknownComponent.java
@@ -14,11 +14,11 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.VerticalPanel;
-import com.vaadin.terminal.gwt.client.SimpleTree;
+import com.vaadin.client.SimpleTree;
 
 public class VUnknownComponent extends Composite {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java b/client/src/com/vaadin/client/ui/Vaadin6Connector.java
index 8d743bb10b..72c7ad6ba8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/Vaadin6Connector.java
+++ b/client/src/com/vaadin/client/ui/Vaadin6Connector.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.client.ui;
 
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
 
 public abstract class Vaadin6Connector extends AbstractComponentConnector
         implements Paintable {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java b/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java
index 85de558f98..b453499c27 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.absolutelayout;
+package com.vaadin.client.ui.absolutelayout;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,20 +22,20 @@ import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.DirectionalManagedLayout;
+import com.vaadin.client.Util;
+import com.vaadin.client.VCaption;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentContainerConnector;
+import com.vaadin.client.ui.LayoutClickEventHandler;
+import com.vaadin.client.ui.absolutelayout.VAbsoluteLayout.AbsoluteWrapper;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.LayoutClickRpc;
 import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutServerRpc;
 import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutState;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.DirectionalManagedLayout;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.absolutelayout.VAbsoluteLayout.AbsoluteWrapper;
 import com.vaadin.ui.AbsoluteLayout;
 
 @Connect(AbsoluteLayout.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/VAbsoluteLayout.java b/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
index 8c572417df..cea75a3bfd 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/VAbsoluteLayout.java
+++ b/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.absolutelayout;
+package com.vaadin.client.ui.absolutelayout;
 
 import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.Document;
@@ -23,8 +23,8 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.VCaption;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.VCaption;
 
 public class VAbsoluteLayout extends ComplexPanel {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java b/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java
index b107f41285..3cee786b06 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java
+++ b/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.accordion;
+package com.vaadin.client.ui.accordion;
 
 import java.util.Iterator;
 
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.SimpleManagedLayout;
+import com.vaadin.client.ui.accordion.VAccordion.StackItem;
+import com.vaadin.client.ui.layout.MayScrollChildren;
+import com.vaadin.client.ui.tabsheet.TabsheetBaseConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
-import com.vaadin.terminal.gwt.client.ui.accordion.VAccordion.StackItem;
-import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
-import com.vaadin.terminal.gwt.client.ui.tabsheet.TabsheetBaseConnector;
 import com.vaadin.ui.Accordion;
 
 @Connect(Accordion.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java b/client/src/com/vaadin/client/ui/accordion/VAccordion.java
index d911dc66f3..e906cf3cce 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java
+++ b/client/src/com/vaadin/client/ui/accordion/VAccordion.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.accordion;
+package com.vaadin.client.ui.accordion;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -27,15 +27,15 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.VCaption;
+import com.vaadin.client.ui.TouchScrollDelegate;
+import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler;
+import com.vaadin.client.ui.tabsheet.VTabsheetBase;
 import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate.TouchScrollHandler;
-import com.vaadin.terminal.gwt.client.ui.tabsheet.VTabsheetBase;
 
 public class VAccordion extends VTabsheetBase {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/audio/AudioConnector.java b/client/src/com/vaadin/client/ui/audio/AudioConnector.java
index df08e44f16..8c2fa179c8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/audio/AudioConnector.java
+++ b/client/src/com/vaadin/client/ui/audio/AudioConnector.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.audio;
+package com.vaadin.client.ui.audio;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.MediaBaseConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.MediaBaseConnector;
 import com.vaadin.ui.Audio;
 
 @Connect(Audio.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/audio/VAudio.java b/client/src/com/vaadin/client/ui/audio/VAudio.java
index 121ad3cc94..8b2a915bab 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/audio/VAudio.java
+++ b/client/src/com/vaadin/client/ui/audio/VAudio.java
@@ -14,11 +14,11 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.audio;
+package com.vaadin.client.ui.audio;
 
 import com.google.gwt.dom.client.AudioElement;
 import com.google.gwt.dom.client.Document;
-import com.vaadin.terminal.gwt.client.ui.VMediaBase;
+import com.vaadin.client.ui.VMediaBase;
 
 public class VAudio extends VMediaBase {
     private static String CLASSNAME = "v-audio";
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java b/client/src/com/vaadin/client/ui/button/ButtonConnector.java
index 59f90a9840..65acddb0a4 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java
+++ b/client/src/com/vaadin/client/ui/button/ButtonConnector.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.button;
+package com.vaadin.client.ui.button;
 
 import java.util.Set;
 
@@ -26,19 +26,19 @@ import com.google.gwt.event.dom.client.FocusEvent;
 import com.google.gwt.event.dom.client.FocusHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.DOM;
+import com.vaadin.client.EventHelper;
+import com.vaadin.client.MouseEventDetailsBuilder;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler;
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.Icon;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.button.ButtonServerRpc;
 import com.vaadin.shared.ui.button.ButtonState;
-import com.vaadin.terminal.gwt.client.EventHelper;
-import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.Icon;
 import com.vaadin.ui.Button;
 
 @Connect(value = Button.class, loadStyle = LoadStyle.EAGER)
@@ -83,17 +83,17 @@ public class ButtonConnector extends AbstractComponentConnector implements
             }
         });
 
-        addStateChangeHandler("icon", new StateChangeHandler() {
+        addStateChangeHandler("resources.icon", new StateChangeHandler() {
             @Override
             public void onStateChanged(StateChangeEvent stateChangeEvent) {
-                if (getState().getIcon() != null) {
+                if (getIcon() != null) {
                     if (getWidget().icon == null) {
                         getWidget().icon = new Icon(getConnection());
                         getWidget().wrapper.insertBefore(
                                 getWidget().icon.getElement(),
                                 getWidget().captionElement);
                     }
-                    getWidget().icon.setUri(getState().getIcon().getURL());
+                    getWidget().icon.setUri(getIcon());
                 } else {
                     if (getWidget().icon != null) {
                         getWidget().wrapper.removeChild(getWidget().icon
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/button/VButton.java b/client/src/com/vaadin/client/ui/button/VButton.java
index baacac08ed..8e611144e4 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/button/VButton.java
+++ b/client/src/com/vaadin/client/ui/button/VButton.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.button;
+package com.vaadin.client.ui.button;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
@@ -27,10 +27,10 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Accessibility;
 import com.google.gwt.user.client.ui.FocusWidget;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.Icon;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.Icon;
 
 public class VButton extends FocusWidget implements ClickHandler {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java b/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java
index 7968a04b5e..1a6547a85c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java
+++ b/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.checkbox;
+package com.vaadin.client.ui.checkbox;
 
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.BlurHandler;
@@ -24,18 +24,18 @@ import com.google.gwt.event.dom.client.FocusHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
+import com.vaadin.client.EventHelper;
+import com.vaadin.client.MouseEventDetailsBuilder;
+import com.vaadin.client.VTooltip;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractFieldConnector;
+import com.vaadin.client.ui.Icon;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.checkbox.CheckBoxServerRpc;
 import com.vaadin.shared.ui.checkbox.CheckBoxState;
-import com.vaadin.terminal.gwt.client.EventHelper;
-import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
-import com.vaadin.terminal.gwt.client.VTooltip;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.Icon;
 import com.vaadin.ui.CheckBox;
 
 @Connect(CheckBox.class)
@@ -96,7 +96,7 @@ public class CheckBoxConnector extends AbstractFieldConnector implements
             getWidget().setEnabled(false);
         }
 
-        if (getState().getIcon() != null) {
+        if (getIcon() != null) {
             if (getWidget().icon == null) {
                 getWidget().icon = new Icon(getConnection());
                 DOM.insertChild(getWidget().getElement(),
@@ -104,7 +104,7 @@ public class CheckBoxConnector extends AbstractFieldConnector implements
                 getWidget().icon.sinkEvents(VTooltip.TOOLTIP_EVENTS);
                 getWidget().icon.sinkEvents(Event.ONCLICK);
             }
-            getWidget().icon.setUri(getState().getIcon().getURL());
+            getWidget().icon.setUri(getIcon());
         } else if (getWidget().icon != null) {
             // detach icon
             DOM.removeChild(getWidget().getElement(),
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/checkbox/VCheckBox.java b/client/src/com/vaadin/client/ui/checkbox/VCheckBox.java
index c796b440f3..e78251cbde 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/checkbox/VCheckBox.java
+++ b/client/src/com/vaadin/client/ui/checkbox/VCheckBox.java
@@ -14,16 +14,16 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.checkbox;
+package com.vaadin.client.ui.checkbox;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VTooltip;
-import com.vaadin.terminal.gwt.client.ui.Field;
-import com.vaadin.terminal.gwt.client.ui.Icon;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Util;
+import com.vaadin.client.VTooltip;
+import com.vaadin.client.ui.Field;
+import com.vaadin.client.ui.Icon;
 
 public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements
         Field {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
index 7be8a1e139..fc060f3deb 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java
+++ b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java
@@ -13,32 +13,31 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.combobox;
+package com.vaadin.client.ui.combobox;
 
 import java.util.Iterator;
 
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.AbstractFieldConnector;
+import com.vaadin.client.ui.SimpleManagedLayout;
+import com.vaadin.client.ui.combobox.VFilterSelect.FilterSelectSuggestion;
+import com.vaadin.client.ui.menubar.MenuItem;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.combobox.ComboBoxConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
-import com.vaadin.terminal.gwt.client.ui.combobox.VFilterSelect.FilterSelectSuggestion;
-import com.vaadin.terminal.gwt.client.ui.menubar.MenuItem;
-import com.vaadin.ui.Select;
-
-@Connect(Select.class)
+import com.vaadin.ui.ComboBox;
+
+@Connect(ComboBox.class)
 public class ComboBoxConnector extends AbstractFieldConnector implements
         Paintable, SimpleManagedLayout {
 
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.gwt.client.Paintable#updateFromUIDL(com.vaadin.terminal
-     * .gwt.client.UIDL, com.vaadin.terminal.gwt.client.ApplicationConnection)
+     * @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.client.UIDL,
+     * com.vaadin.client.ApplicationConnection)
      */
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java b/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java
index 5f5826526c..9bf758fcba 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java
+++ b/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.combobox;
+package com.vaadin.client.ui.combobox;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -56,22 +56,22 @@ import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.PopupPanel.PositionCallback;
 import com.google.gwt.user.client.ui.SuggestOracle.Suggestion;
 import com.google.gwt.user.client.ui.TextBox;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.Focusable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ui.Field;
+import com.vaadin.client.ui.SubPartAware;
+import com.vaadin.client.ui.VLazyExecutor;
+import com.vaadin.client.ui.VOverlay;
+import com.vaadin.client.ui.menubar.MenuBar;
+import com.vaadin.client.ui.menubar.MenuItem;
 import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.EventId;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ui.Field;
-import com.vaadin.terminal.gwt.client.ui.SubPartAware;
-import com.vaadin.terminal.gwt.client.ui.VLazyExecutor;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
-import com.vaadin.terminal.gwt.client.ui.menubar.MenuBar;
-import com.vaadin.terminal.gwt.client.ui.menubar.MenuItem;
 
 /**
  * Client side implementation of the Select component.
@@ -1583,7 +1583,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.Focusable#focus()
+     * @see com.vaadin.client.Focusable#focus()
      */
 
     @Override
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java b/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java
index 2e51d717a4..0d7e511ddb 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.csslayout;
+package com.vaadin.client.ui.csslayout;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,20 +21,20 @@ import java.util.Map;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.Util;
+import com.vaadin.client.VCaption;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractLayoutConnector;
+import com.vaadin.client.ui.LayoutClickEventHandler;
+import com.vaadin.client.ui.csslayout.VCssLayout.FlowPane;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.LayoutClickRpc;
 import com.vaadin.shared.ui.csslayout.CssLayoutServerRpc;
 import com.vaadin.shared.ui.csslayout.CssLayoutState;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.csslayout.VCssLayout.FlowPane;
 import com.vaadin.ui.CssLayout;
 
 @Connect(CssLayout.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/csslayout/VCssLayout.java b/client/src/com/vaadin/client/ui/csslayout/VCssLayout.java
index e66b1c4208..e7c78fadb2 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/csslayout/VCssLayout.java
+++ b/client/src/com/vaadin/client/ui/csslayout/VCssLayout.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.csslayout;
+package com.vaadin.client.ui.csslayout;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java b/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java
index 0557b10437..5ad7bb715a 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java
+++ b/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.customcomponent;
+package com.vaadin.client.ui.customcomponent;
 
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.ui.CustomComponent;
 
 @Connect(value = CustomComponent.class, loadStyle = LoadStyle.EAGER)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/customcomponent/VCustomComponent.java b/client/src/com/vaadin/client/ui/customcomponent/VCustomComponent.java
index 854f7c161e..fa2d5c4fa1 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/customcomponent/VCustomComponent.java
+++ b/client/src/com/vaadin/client/ui/customcomponent/VCustomComponent.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.customcomponent;
+package com.vaadin.client.ui.customcomponent;
 
 import com.google.gwt.user.client.ui.SimplePanel;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/customfield/CustomFieldConnector.java b/client/src/com/vaadin/client/ui/customfield/CustomFieldConnector.java
index 4120168f62..f3b01a8f97 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/customfield/CustomFieldConnector.java
+++ b/client/src/com/vaadin/client/ui/customfield/CustomFieldConnector.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.customfield;
+package com.vaadin.client.ui.customfield;
 
 import com.google.gwt.core.client.GWT;
+import com.vaadin.client.ui.customcomponent.CustomComponentConnector;
 import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.communication.SharedState;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ui.customcomponent.CustomComponentConnector;
 import com.vaadin.ui.CustomField;
 
 @Connect(value = CustomField.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java b/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java
index 1e5cbd0502..c06bbd5391 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.customlayout;
+package com.vaadin.client.ui.customlayout;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractLayoutConnector;
+import com.vaadin.client.ui.SimpleManagedLayout;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.customlayout.CustomLayoutState;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
-import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
 import com.vaadin.ui.CustomLayout;
 
 @Connect(CustomLayout.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/customlayout/VCustomLayout.java b/client/src/com/vaadin/client/ui/customlayout/VCustomLayout.java
index 6fd8b19e7c..aecbb73cb8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/customlayout/VCustomLayout.java
+++ b/client/src/com/vaadin/client/ui/customlayout/VCustomLayout.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.customlayout;
+package com.vaadin.client.ui.customlayout;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -26,12 +26,12 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.VCaptionWrapper;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.Util;
+import com.vaadin.client.VCaption;
+import com.vaadin.client.VCaptionWrapper;
 
 /**
  * Custom Layout implements complex layout defined with HTML template.
@@ -375,7 +375,7 @@ public class VCustomLayout extends ComplexPanel {
     /*-{
     	var self = this;
     	element.notifyChildrenOfSizeChange = $entry(function() {
-    		self.@com.vaadin.terminal.gwt.client.ui.customlayout.VCustomLayout::notifyChildrenOfSizeChange()();
+    		self.@com.vaadin.client.ui.customlayout.VCustomLayout::notifyChildrenOfSizeChange()();
     	});
     }-*/;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java b/client/src/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java
index 791849b067..62facc380c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java
+++ b/client/src/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.datefield;
+package com.vaadin.client.ui.datefield;
 
 import java.util.Date;
 
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.LocaleNotLoadedException;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ui.AbstractFieldConnector;
 import com.vaadin.shared.ui.datefield.DateFieldConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.LocaleNotLoadedException;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
 
 public class AbstractDateFieldConnector extends AbstractFieldConnector
         implements Paintable {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java b/client/src/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java
index 52f10348b7..0bcb828b19 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java
+++ b/client/src/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.datefield;
+package com.vaadin.client.ui.datefield;
 
 import java.util.Date;
 
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.DateTimeService;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.datefield.VCalendarPanel.FocusChangeListener;
+import com.vaadin.client.ui.datefield.VCalendarPanel.TimeChangeListener;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.DateTimeService;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.FocusChangeListener;
-import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.TimeChangeListener;
 import com.vaadin.ui.InlineDateField;
 
 @Connect(InlineDateField.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java b/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
index 6c4ec40694..d09f3a4db6 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java
+++ b/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java
@@ -14,16 +14,16 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.datefield;
+package com.vaadin.client.ui.datefield;
 
 import java.util.Date;
 
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.DateTimeService;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.datefield.VCalendarPanel.FocusChangeListener;
+import com.vaadin.client.ui.datefield.VCalendarPanel.TimeChangeListener;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.DateTimeService;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.FocusChangeListener;
-import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.TimeChangeListener;
 import com.vaadin.ui.DateField;
 
 @Connect(DateField.class)
@@ -32,10 +32,8 @@ public class PopupDateFieldConnector extends TextualDateConnector {
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.gwt.client.ui.VTextualDate#updateFromUIDL(com.vaadin
-     * .terminal.gwt.client.UIDL,
-     * com.vaadin.terminal.gwt.client.ApplicationConnection)
+     * @see com.vaadin.client.ui.VTextualDate#updateFromUIDL(com.vaadin
+     * .client.UIDL, com.vaadin.client.ApplicationConnection)
      */
     @Override
     @SuppressWarnings("deprecation")
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/TextualDateConnector.java b/client/src/com/vaadin/client/ui/datefield/TextualDateConnector.java
index 01c1529429..f0a99192fa 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/TextualDateConnector.java
+++ b/client/src/com/vaadin/client/ui/datefield/TextualDateConnector.java
@@ -14,10 +14,10 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.datefield;
+package com.vaadin.client.ui.datefield;
 
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.UIDL;
 
 public class TextualDateConnector extends AbstractDateFieldConnector {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VCalendarPanel.java b/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java
index b61ce5dbf3..dc40675e0a 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VCalendarPanel.java
+++ b/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.datefield;
+package com.vaadin.client.ui.datefield;
 
 import java.util.Date;
 import java.util.Iterator;
@@ -48,14 +48,14 @@ import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.InlineHTML;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.DateTimeService;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ui.FocusableFlexTable;
-import com.vaadin.terminal.gwt.client.ui.SubPartAware;
-import com.vaadin.terminal.gwt.client.ui.label.VLabel;
-import com.vaadin.terminal.gwt.client.ui.nativeselect.VNativeSelect;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.DateTimeService;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ui.FocusableFlexTable;
+import com.vaadin.client.ui.SubPartAware;
+import com.vaadin.client.ui.label.VLabel;
+import com.vaadin.client.ui.nativeselect.VNativeSelect;
 
 @SuppressWarnings("deprecation")
 public class VCalendarPanel extends FocusableFlexTable implements
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateField.java b/client/src/com/vaadin/client/ui/datefield/VDateField.java
index a339fb36d0..788433027b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateField.java
+++ b/client/src/com/vaadin/client/ui/datefield/VDateField.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.datefield;
+package com.vaadin.client.ui.datefield;
 
 import java.util.Date;
 
 import com.google.gwt.user.client.ui.FlowPanel;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.DateTimeService;
-import com.vaadin.terminal.gwt.client.ui.Field;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.DateTimeService;
+import com.vaadin.client.ui.Field;
 
 public class VDateField extends FlowPanel implements Field {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateFieldCalendar.java b/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java
index 42640f0c0b..cf998421fd 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateFieldCalendar.java
+++ b/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.datefield;
+package com.vaadin.client.ui.datefield;
 
 import java.util.Date;
 
 import com.google.gwt.event.dom.client.DomEvent;
-import com.vaadin.terminal.gwt.client.DateTimeService;
-import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.FocusOutListener;
-import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.SubmitListener;
+import com.vaadin.client.DateTimeService;
+import com.vaadin.client.ui.datefield.VCalendarPanel.FocusOutListener;
+import com.vaadin.client.ui.datefield.VCalendarPanel.SubmitListener;
 
 /**
  * A client side implementation for InlineDateField
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VPopupCalendar.java b/client/src/com/vaadin/client/ui/datefield/VPopupCalendar.java
index b7e0a2fb4e..e5aeb2efe8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VPopupCalendar.java
+++ b/client/src/com/vaadin/client/ui/datefield/VPopupCalendar.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.datefield;
+package com.vaadin.client.ui.datefield;
 
 import java.util.Date;
 
@@ -33,22 +33,22 @@ import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.PopupPanel.PositionCallback;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ui.Field;
-import com.vaadin.terminal.gwt.client.ui.SubPartAware;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
-import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.FocusOutListener;
-import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.SubmitListener;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ui.Field;
+import com.vaadin.client.ui.SubPartAware;
+import com.vaadin.client.ui.VOverlay;
+import com.vaadin.client.ui.datefield.VCalendarPanel.FocusOutListener;
+import com.vaadin.client.ui.datefield.VCalendarPanel.SubmitListener;
 
 /**
  * Represents a date selection component with a text field and a popup date
  * selector.
  * 
  * <b>Note:</b> To change the keyboard assignments used in the popup dialog you
- * should extend <code>com.vaadin.terminal.gwt.client.ui.VCalendarPanel</code>
- * and then pass set it by calling the
- * <code>setCalendarPanel(VCalendarPanel panel)</code> method.
+ * should extend <code>com.vaadin.client.ui.VCalendarPanel</code> and then pass
+ * set it by calling the <code>setCalendarPanel(VCalendarPanel panel)</code>
+ * method.
  * 
  */
 public class VPopupCalendar extends VTextualDate implements Field,
@@ -298,7 +298,7 @@ public class VPopupCalendar extends VTextualDate implements Field,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.ui.VTextualDate#buildDate()
+     * @see com.vaadin.client.ui.VTextualDate#buildDate()
      */
     @Override
     protected void buildDate() {
@@ -329,8 +329,7 @@ public class VPopupCalendar extends VTextualDate implements Field,
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.gwt.client.ui.VDateField#onBrowserEvent(com.google
+     * @see com.vaadin.client.ui.VDateField#onBrowserEvent(com.google
      * .gwt.user.client.Event)
      */
     @Override
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VTextualDate.java b/client/src/com/vaadin/client/ui/datefield/VTextualDate.java
index 4e82058f68..5d19cf5db2 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VTextualDate.java
+++ b/client/src/com/vaadin/client/ui/datefield/VTextualDate.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.datefield;
+package com.vaadin.client.ui.datefield;
 
 import java.util.Date;
 
@@ -26,14 +26,14 @@ import com.google.gwt.event.dom.client.FocusEvent;
 import com.google.gwt.event.dom.client.FocusHandler;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.TextBox;
+import com.vaadin.client.Focusable;
+import com.vaadin.client.LocaleNotLoadedException;
+import com.vaadin.client.LocaleService;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ui.Field;
+import com.vaadin.client.ui.SubPartAware;
+import com.vaadin.client.ui.textfield.VTextField;
 import com.vaadin.shared.EventId;
-import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.LocaleNotLoadedException;
-import com.vaadin.terminal.gwt.client.LocaleService;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ui.Field;
-import com.vaadin.terminal.gwt.client.ui.SubPartAware;
-import com.vaadin.terminal.gwt.client.ui.textfield.VTextField;
 
 public class VTextualDate extends VDateField implements Field, ChangeHandler,
         Focusable, SubPartAware {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java b/client/src/com/vaadin/client/ui/dd/DDUtil.java
index a4d00f59de..a0e5ba3700 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/DDUtil.java
+++ b/client/src/com/vaadin/client/ui/dd/DDUtil.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Window;
+import com.vaadin.client.Util;
 import com.vaadin.shared.ui.dd.HorizontalDropLocation;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
-import com.vaadin.terminal.gwt.client.Util;
 
 public class DDUtil {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java b/client/src/com/vaadin/client/ui/dd/VAbstractDropHandler.java
index bf0ab24c32..631b0c4839 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAbstractDropHandler.java
+++ b/client/src/com/vaadin/client/ui/dd/VAbstractDropHandler.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 import java.util.Iterator;
 
 import com.google.gwt.user.client.Command;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.UIDL;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DropTarget;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.UIDL;
 
 public abstract class VAbstractDropHandler implements VDropHandler {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java b/client/src/com/vaadin/client/ui/dd/VAcceptAll.java
index 661e47c506..24bebb2907 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptAll.java
+++ b/client/src/com/vaadin/client/ui/dd/VAcceptAll.java
@@ -16,11 +16,11 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
+import com.vaadin.client.UIDL;
 import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.UIDL;
 
 @AcceptCriterion(AcceptAll.class)
 final public class VAcceptAll extends VAcceptCriterion {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCallback.java b/client/src/com/vaadin/client/ui/dd/VAcceptCallback.java
index a8b3518406..c9d3fefd70 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCallback.java
+++ b/client/src/com/vaadin/client/ui/dd/VAcceptCallback.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 public interface VAcceptCallback {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java b/client/src/com/vaadin/client/ui/dd/VAcceptCriteria.java
index 05330c2187..e3f125cfb2 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriteria.java
+++ b/client/src/com/vaadin/client/ui/dd/VAcceptCriteria.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 import com.google.gwt.core.client.GWT;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java b/client/src/com/vaadin/client/ui/dd/VAcceptCriterion.java
index 6d3bda9676..6c0b6cc64a 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterion.java
+++ b/client/src/com/vaadin/client/ui/dd/VAcceptCriterion.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
-import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.client.UIDL;
 
 public abstract class VAcceptCriterion {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java b/client/src/com/vaadin/client/ui/dd/VAcceptCriterionFactory.java
index a0ff9ecfdf..dee006805b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAcceptCriterionFactory.java
+++ b/client/src/com/vaadin/client/ui/dd/VAcceptCriterionFactory.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 /**
  * Generated by
- * {@link com.vaadin.terminal.gwt.widgetsetutils.AcceptCriteriaFactoryGenerator}
+ * {@link com.vaadin.server.widgetsetutils.AcceptCriteriaFactoryGenerator}
  */
 public abstract class VAcceptCriterionFactory {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java b/client/src/com/vaadin/client/ui/dd/VAnd.java
index 8eb72712ef..6e1c999a54 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VAnd.java
+++ b/client/src/com/vaadin/client/ui/dd/VAnd.java
@@ -16,11 +16,11 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
+import com.vaadin.client.UIDL;
 import com.vaadin.event.dd.acceptcriteria.And;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.UIDL;
 
 @AcceptCriterion(And.class)
 final public class VAnd extends VAcceptCriterion implements VAcceptCallback {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java b/client/src/com/vaadin/client/ui/dd/VContainsDataFlavor.java
index f06aa7eb15..ca6e7736d9 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VContainsDataFlavor.java
+++ b/client/src/com/vaadin/client/ui/dd/VContainsDataFlavor.java
@@ -16,11 +16,11 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
+import com.vaadin.client.UIDL;
 import com.vaadin.event.dd.acceptcriteria.ContainsDataFlavor;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.UIDL;
 
 @AcceptCriterion(ContainsDataFlavor.class)
 final public class VContainsDataFlavor extends VAcceptCriterion {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java b/client/src/com/vaadin/client/ui/dd/VDragAndDropManager.java
index 82592d1846..6667dc7438 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java
+++ b/client/src/com/vaadin/client/ui/dd/VDragAndDropManager.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;
@@ -34,15 +34,15 @@ import com.google.gwt.user.client.Event.NativePreviewHandler;
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.MouseEventDetailsBuilder;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ValueMap;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.dd.DragEventType;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ValueMap;
 
 /**
  * Helper class to manage the state of drag and drop event on Vaadin client
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEvent.java b/client/src/com/vaadin/client/ui/dd/VDragEvent.java
index 7b3950f64f..6ebc6d4b04 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEvent.java
+++ b/client/src/com/vaadin/client/ui/dd/VDragEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,8 +25,8 @@ import com.google.gwt.dom.client.TableElement;
 import com.google.gwt.dom.client.TableSectionElement;
 import com.google.gwt.event.dom.client.MouseOverEvent;
 import com.google.gwt.user.client.Element;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.Util;
 
 /**
  * DragEvent used by Vaadin client side engine. Supports components, items,
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEventServerCallback.java b/client/src/com/vaadin/client/ui/dd/VDragEventServerCallback.java
index 00fe2d2659..5abc16a527 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEventServerCallback.java
+++ b/client/src/com/vaadin/client/ui/dd/VDragEventServerCallback.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
-import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.client.UIDL;
 
 public interface VDragEventServerCallback {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragSourceIs.java b/client/src/com/vaadin/client/ui/dd/VDragSourceIs.java
index e812ca8117..cd0dce109a 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDragSourceIs.java
+++ b/client/src/com/vaadin/client/ui/dd/VDragSourceIs.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.UIDL;
 import com.vaadin.event.dd.acceptcriteria.SourceIs;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.UIDL;
 
 /**
  * TODO Javadoc!
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDropHandler.java b/client/src/com/vaadin/client/ui/dd/VDropHandler.java
index ddc3af9931..79b395b6a3 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VDropHandler.java
+++ b/client/src/com/vaadin/client/ui/dd/VDropHandler.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
 
 /**
  * Vaadin Widgets that want to receive something via drag and drop implement
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHasDropHandler.java b/client/src/com/vaadin/client/ui/dd/VHasDropHandler.java
index 01c57741d8..8c1491498c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHasDropHandler.java
+++ b/client/src/com/vaadin/client/ui/dd/VHasDropHandler.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
-import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.client.ComponentConnector;
 
 /**
  * Used to detect Widget from widget tree that has {@link #getDropHandler()}
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent.java b/client/src/com/vaadin/client/ui/dd/VHtml5DragEvent.java
index 34bdb28c91..37de91621d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent.java
+++ b/client/src/com/vaadin/client/ui/dd/VHtml5DragEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 import com.google.gwt.core.client.JsArrayString;
 import com.google.gwt.dom.client.NativeEvent;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java b/client/src/com/vaadin/client/ui/dd/VHtml5File.java
index 961008c860..3b28344f6c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VHtml5File.java
+++ b/client/src/com/vaadin/client/ui/dd/VHtml5File.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 import com.google.gwt.core.client.JavaScriptObject;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java b/client/src/com/vaadin/client/ui/dd/VIsOverId.java
index c9bf630658..8b4196241c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VIsOverId.java
+++ b/client/src/com/vaadin/client/ui/dd/VIsOverId.java
@@ -16,12 +16,12 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.UIDL;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.ui.AbstractSelect;
 
 @AcceptCriterion(AbstractSelect.TargetItemIs.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VItemIdIs.java b/client/src/com/vaadin/client/ui/dd/VItemIdIs.java
index 4f6aca082b..955b6fd950 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VItemIdIs.java
+++ b/client/src/com/vaadin/client/ui/dd/VItemIdIs.java
@@ -16,11 +16,11 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.UIDL;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.ui.AbstractSelect;
 
 @AcceptCriterion(AbstractSelect.AcceptItem.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java b/client/src/com/vaadin/client/ui/dd/VLazyInitItemIdentifiers.java
index ad028b7198..325ff2e47b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VLazyInitItemIdentifiers.java
+++ b/client/src/com/vaadin/client/ui/dd/VLazyInitItemIdentifiers.java
@@ -16,12 +16,12 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 import java.util.HashSet;
 
+import com.vaadin.client.UIDL;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Tree;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java b/client/src/com/vaadin/client/ui/dd/VNot.java
index 662b1c2da2..4c5ff387ab 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VNot.java
+++ b/client/src/com/vaadin/client/ui/dd/VNot.java
@@ -16,12 +16,12 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
+import com.vaadin.client.UIDL;
+import com.vaadin.client.VConsole;
 import com.vaadin.event.dd.acceptcriteria.Not;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.VConsole;
 
 /**
  * TODO implementation could now be simplified/optimized
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java b/client/src/com/vaadin/client/ui/dd/VOr.java
index b51800e31f..a969b98715 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VOr.java
+++ b/client/src/com/vaadin/client/ui/dd/VOr.java
@@ -16,11 +16,11 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
+import com.vaadin.client.UIDL;
 import com.vaadin.event.dd.acceptcriteria.Or;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.UIDL;
 
 /**
  * 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java b/client/src/com/vaadin/client/ui/dd/VOverTreeNode.java
index 77fd89c123..80697900de 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VOverTreeNode.java
+++ b/client/src/com/vaadin/client/ui/dd/VOverTreeNode.java
@@ -16,9 +16,9 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
-import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.client.UIDL;
 
 final public class VOverTreeNode extends VAcceptCriterion {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java b/client/src/com/vaadin/client/ui/dd/VServerAccept.java
index eee0f47a91..78cf41faf8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VServerAccept.java
+++ b/client/src/com/vaadin/client/ui/dd/VServerAccept.java
@@ -16,11 +16,11 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
+import com.vaadin.client.UIDL;
 import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.UIDL;
 
 @AcceptCriterion(ServerSideCriterion.class)
 final public class VServerAccept extends VAcceptCriterion {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsTarget.java b/client/src/com/vaadin/client/ui/dd/VSourceIsTarget.java
index 21e6ab130a..94a19ff1c8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VSourceIsTarget.java
+++ b/client/src/com/vaadin/client/ui/dd/VSourceIsTarget.java
@@ -16,12 +16,12 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.UIDL;
 import com.vaadin.event.dd.acceptcriteria.SourceIsTarget;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.UIDL;
 
 @AcceptCriterion(SourceIsTarget.class)
 final public class VSourceIsTarget extends VAcceptCriterion {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetDetailIs.java b/client/src/com/vaadin/client/ui/dd/VTargetDetailIs.java
index 8c6c522be4..b903445e84 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetDetailIs.java
+++ b/client/src/com/vaadin/client/ui/dd/VTargetDetailIs.java
@@ -16,11 +16,11 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
+import com.vaadin.client.UIDL;
 import com.vaadin.event.dd.acceptcriteria.TargetDetailIs;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.UIDL;
 
 @AcceptCriterion(TargetDetailIs.class)
 final public class VTargetDetailIs extends VAcceptCriterion {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetInSubtree.java b/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java
index 56421a6ed7..c5923c7436 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTargetInSubtree.java
+++ b/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java
@@ -16,13 +16,13 @@
 /**
  * 
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.tree.VTree;
+import com.vaadin.client.ui.tree.VTree.TreeNode;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.tree.VTree;
-import com.vaadin.terminal.gwt.client.ui.tree.VTree.TreeNode;
 import com.vaadin.ui.Tree;
 
 @AcceptCriterion(Tree.TargetInSubtree.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTransferable.java b/client/src/com/vaadin/client/ui/dd/VTransferable.java
index 12cd1ed598..42692fcd20 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/dd/VTransferable.java
+++ b/client/src/com/vaadin/client/ui/dd/VTransferable.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.client.ui.dd;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.vaadin.client.ComponentConnector;
 import com.vaadin.event.dd.DragSource;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
 
 /**
  * Client side counterpart for Transferable in com.vaadin.event.Transferable
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_alignment.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_alignment.png
index 49b918ec0c..49b918ec0c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_alignment.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_alignment.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png
index 9fd6635765..9fd6635765 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_h150.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_h150.png
index 7cd07369dc..7cd07369dc 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_h150.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_h150.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal.png
index c2e1f49efe..c2e1f49efe 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png
index 417c9aecfd..417c9aecfd 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_margin.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_margin.png
index 2f1e461b0a..2f1e461b0a 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_margin.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_margin.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_no_caption.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_no_caption.png
index 63984cdee7..63984cdee7 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_no_caption.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_no_caption.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_normal_caption.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_normal_caption.png
index 1e730c072b..1e730c072b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_normal_caption.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_normal_caption.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_special-margin.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_special-margin.png
index 34e47d1551..34e47d1551 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_special-margin.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_special-margin.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical.png
index 99e3709acc..99e3709acc 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical_spacing.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical_spacing.png
index be9a4cd8c5..be9a4cd8c5 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical_spacing.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_vertical_spacing.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_w300.png
index 0b555ad1e7..0b555ad1e7 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_w300.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300_h150.png b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_w300_h150.png
index 8ff42ed0f4..8ff42ed0f4 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300_h150.png
+++ b/client/src/com/vaadin/client/ui/doc-files/IOrderedLayout_w300_h150.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java b/client/src/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
index 7542754e58..96c68bbbb5 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
+++ b/client/src/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.draganddropwrapper;
+package com.vaadin.client.ui.draganddropwrapper;
 
 import java.util.HashMap;
 import java.util.Set;
 
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.customcomponent.CustomComponentConnector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.draganddropwrapper.DragAndDropWrapperConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.customcomponent.CustomComponentConnector;
 import com.vaadin.ui.DragAndDropWrapper;
 
 @Connect(DragAndDropWrapper.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java b/client/src/com/vaadin/client/ui/draganddropwrapper/VDragAndDropWrapper.java
index 7d38624f22..e983015dfc 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java
+++ b/client/src/com/vaadin/client/ui/draganddropwrapper/VDragAndDropWrapper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.draganddropwrapper;
+package com.vaadin.client.ui.draganddropwrapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,27 +34,27 @@ import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.xhr.client.ReadyStateChangeHandler;
 import com.google.gwt.xhr.client.XMLHttpRequest;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.MouseEventDetailsBuilder;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ValueMap;
+import com.vaadin.client.ui.customcomponent.VCustomComponent;
+import com.vaadin.client.ui.dd.DDUtil;
+import com.vaadin.client.ui.dd.VAbstractDropHandler;
+import com.vaadin.client.ui.dd.VAcceptCallback;
+import com.vaadin.client.ui.dd.VDragAndDropManager;
+import com.vaadin.client.ui.dd.VDragEvent;
+import com.vaadin.client.ui.dd.VDropHandler;
+import com.vaadin.client.ui.dd.VHasDropHandler;
+import com.vaadin.client.ui.dd.VHtml5DragEvent;
+import com.vaadin.client.ui.dd.VHtml5File;
+import com.vaadin.client.ui.dd.VTransferable;
 import com.vaadin.shared.ui.dd.HorizontalDropLocation;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ValueMap;
-import com.vaadin.terminal.gwt.client.ui.customcomponent.VCustomComponent;
-import com.vaadin.terminal.gwt.client.ui.dd.DDUtil;
-import com.vaadin.terminal.gwt.client.ui.dd.VAbstractDropHandler;
-import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCallback;
-import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager;
-import com.vaadin.terminal.gwt.client.ui.dd.VDragEvent;
-import com.vaadin.terminal.gwt.client.ui.dd.VDropHandler;
-import com.vaadin.terminal.gwt.client.ui.dd.VHasDropHandler;
-import com.vaadin.terminal.gwt.client.ui.dd.VHtml5DragEvent;
-import com.vaadin.terminal.gwt.client.ui.dd.VHtml5File;
-import com.vaadin.terminal.gwt.client.ui.dd.VTransferable;
 
 /**
  * 
@@ -522,7 +522,7 @@ public class VDragAndDropWrapper extends VCustomComponent implements
     /*-{
         var me = this;
         el.addEventListener("dragstart",  $entry(function(ev) {
-            return me.@com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragStart(Lcom/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent;)(ev);
+            return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragStart(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
         }), false);
     }-*/;
 
@@ -536,19 +536,19 @@ public class VDragAndDropWrapper extends VCustomComponent implements
             var me = this;
 
             el.addEventListener("dragenter",  $entry(function(ev) {
-                return me.@com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragEnter(Lcom/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent;)(ev);
+                return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragEnter(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
             }), false);
 
             el.addEventListener("dragleave",  $entry(function(ev) {
-                return me.@com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragLeave(Lcom/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent;)(ev);
+                return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragLeave(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
             }), false);
 
             el.addEventListener("dragover",  $entry(function(ev) {
-                return me.@com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragOver(Lcom/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent;)(ev);
+                return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragOver(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
             }), false);
 
             el.addEventListener("drop",  $entry(function(ev) {
-                return me.@com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragDrop(Lcom/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent;)(ev);
+                return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragDrop(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
             }), false);
     }-*/;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapperIE.java b/client/src/com/vaadin/client/ui/draganddropwrapper/VDragAndDropWrapperIE.java
index fc9829d387..b0323ab289 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapperIE.java
+++ b/client/src/com/vaadin/client/ui/draganddropwrapper/VDragAndDropWrapperIE.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.draganddropwrapper;
+package com.vaadin.client.ui.draganddropwrapper;
 
 import com.google.gwt.dom.client.AnchorElement;
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.user.client.Element;
-import com.vaadin.terminal.gwt.client.VConsole;
+import com.vaadin.client.VConsole;
 
 public class VDragAndDropWrapperIE extends VDragAndDropWrapper {
     private AnchorElement anchor = null;
@@ -52,7 +52,7 @@ public class VDragAndDropWrapperIE extends VDragAndDropWrapper {
         var me = this;
 
         el.attachEvent("ondragstart",  $entry(function(ev) {
-            return me.@com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragStart(Lcom/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent;)(ev);
+            return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragStart(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
         }));
     }-*/;
 
@@ -62,19 +62,19 @@ public class VDragAndDropWrapperIE extends VDragAndDropWrapper {
         var me = this;
 
         el.attachEvent("ondragenter",  $entry(function(ev) {
-            return me.@com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragEnter(Lcom/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent;)(ev);
+            return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragEnter(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
         }));
 
         el.attachEvent("ondragleave",  $entry(function(ev) {
-            return me.@com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragLeave(Lcom/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent;)(ev);
+            return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragLeave(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
         }));
 
         el.attachEvent("ondragover",  $entry(function(ev) {
-            return me.@com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragOver(Lcom/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent;)(ev);
+            return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragOver(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
         }));
 
         el.attachEvent("ondrop",  $entry(function(ev) {
-            return me.@com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragDrop(Lcom/vaadin/terminal/gwt/client/ui/dd/VHtml5DragEvent;)(ev);
+            return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragDrop(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev);
         }));
     }-*/;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java b/client/src/com/vaadin/client/ui/embedded/EmbeddedConnector.java
index 5c95f9f554..dffb73f099 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java
+++ b/client/src/com/vaadin/client/ui/embedded/EmbeddedConnector.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.embedded;
+package com.vaadin.client.ui.embedded;
 
 import java.util.Map;
 
@@ -27,18 +27,18 @@ import com.google.gwt.dom.client.Style;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.VTooltip;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.ClickEventHandler;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.embedded.EmbeddedConstants;
 import com.vaadin.shared.ui.embedded.EmbeddedServerRpc;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.VTooltip;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
 import com.vaadin.ui.Embedded;
 
 @Connect(Embedded.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/embedded/VEmbedded.java b/client/src/com/vaadin/client/ui/embedded/VEmbedded.java
index dca4686a5c..239bb4ad46 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/embedded/VEmbedded.java
+++ b/client/src/com/vaadin/client/ui/embedded/VEmbedded.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.embedded;
+package com.vaadin.client.ui.embedded;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -24,14 +24,14 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.HTML;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
 import com.vaadin.shared.ui.embedded.EmbeddedConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VConsole;
 
 public class VEmbedded extends HTML {
     public static String CLASSNAME = "v-embedded";
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/embeddedbrowser/EmbeddedBrowserConnector.java b/client/src/com/vaadin/client/ui/embeddedbrowser/EmbeddedBrowserConnector.java
index 61231c4fba..b0cd6d773d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/embeddedbrowser/EmbeddedBrowserConnector.java
+++ b/client/src/com/vaadin/client/ui/embeddedbrowser/EmbeddedBrowserConnector.java
@@ -1,9 +1,10 @@
-package com.vaadin.terminal.gwt.client.ui.embeddedbrowser;
+package com.vaadin.client.ui.embeddedbrowser;
 
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.shared.ui.AbstractEmbeddedState;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.embeddedbrowser.EmbeddedBrowserState;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 
 @Connect(com.vaadin.ui.EmbeddedBrowser.class)
 public class EmbeddedBrowserConnector extends AbstractComponentConnector {
@@ -30,8 +31,7 @@ public class EmbeddedBrowserConnector extends AbstractComponentConnector {
 
         getWidget().setAlternateText(getState().getAlternateText());
         getWidget().setSource(
-                getState().getSource() != null ? getState().getSource()
-                        .getURL() : null);
+                getResourceUrl(AbstractEmbeddedState.SOURCE_RESOURCE));
         getWidget().setName(getConnectorId());
     }
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/embeddedbrowser/VEmbeddedBrowser.java b/client/src/com/vaadin/client/ui/embeddedbrowser/VEmbeddedBrowser.java
index fffbff049e..3fe1c44bc3 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/embeddedbrowser/VEmbeddedBrowser.java
+++ b/client/src/com/vaadin/client/ui/embeddedbrowser/VEmbeddedBrowser.java
@@ -1,4 +1,4 @@
-package com.vaadin.terminal.gwt.client.ui.embeddedbrowser;
+package com.vaadin.client.ui.embeddedbrowser;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/flash/FlashConnector.java b/client/src/com/vaadin/client/ui/flash/FlashConnector.java
index a9e7a71013..cc5423dd20 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/flash/FlashConnector.java
+++ b/client/src/com/vaadin/client/ui/flash/FlashConnector.java
@@ -1,9 +1,10 @@
-package com.vaadin.terminal.gwt.client.ui.flash;
+package com.vaadin.client.ui.flash;
 
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.shared.ui.AbstractEmbeddedState;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.flash.FlashState;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 
 @Connect(com.vaadin.ui.Flash.class)
 public class FlashConnector extends AbstractComponentConnector {
@@ -29,8 +30,7 @@ public class FlashConnector extends AbstractComponentConnector {
         super.onStateChanged(stateChangeEvent);
 
         getWidget().setSource(
-                getState().getSource() != null ? getState().getSource()
-                        .getURL() : null);
+                getResourceUrl(AbstractEmbeddedState.SOURCE_RESOURCE));
         getWidget().setArchive(getState().getArchive());
         getWidget().setClassId(getState().getClassId());
         getWidget().setCodebase(getState().getCodebase());
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/flash/VFlash.java b/client/src/com/vaadin/client/ui/flash/VFlash.java
index 5d60dc66aa..1f94f21056 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/flash/VFlash.java
+++ b/client/src/com/vaadin/client/ui/flash/VFlash.java
@@ -1,10 +1,10 @@
-package com.vaadin.terminal.gwt.client.ui.flash;
+package com.vaadin.client.ui.flash;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import com.google.gwt.user.client.ui.HTML;
-import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.client.Util;
 
 public class VFlash extends HTML {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java b/client/src/com/vaadin/client/ui/form/FormConnector.java
index a38a67f84b..1b97bbc4cb 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java
+++ b/client/src/com/vaadin/client/ui/form/FormConnector.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.form;
+package com.vaadin.client.ui.form;
 
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.event.dom.client.KeyDownEvent;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.AbstractComponentContainerConnector;
+import com.vaadin.client.ui.Icon;
+import com.vaadin.client.ui.ShortcutActionHandler;
+import com.vaadin.client.ui.layout.ElementResizeEvent;
+import com.vaadin.client.ui.layout.ElementResizeListener;
+import com.vaadin.client.ui.layout.MayScrollChildren;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.form.FormState;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.Icon;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
-import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeEvent;
-import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeListener;
-import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
 import com.vaadin.ui.Form;
 
 @Connect(Form.class)
@@ -87,12 +87,12 @@ public class FormConnector extends AbstractComponentContainerConnector
         } else {
             getWidget().caption.setInnerText("");
         }
-        if (getState().getIcon() != null) {
+        if (getIcon() != null) {
             if (getWidget().icon == null) {
                 getWidget().icon = new Icon(client);
                 getWidget().legend.insertFirst(getWidget().icon.getElement());
             }
-            getWidget().icon.setUri(getState().getIcon().getURL());
+            getWidget().icon.setUri(getIcon());
             legendEmpty = false;
         } else {
             if (getWidget().icon != null) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/form/VForm.java b/client/src/com/vaadin/client/ui/form/VForm.java
index 8cd7139eed..9b8dd80652 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/form/VForm.java
+++ b/client/src/com/vaadin/client/ui/form/VForm.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.form;
+package com.vaadin.client.ui.form;
 
 import com.google.gwt.event.dom.client.KeyDownEvent;
 import com.google.gwt.event.dom.client.KeyDownHandler;
@@ -24,10 +24,10 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.VErrorMessage;
-import com.vaadin.terminal.gwt.client.ui.Icon;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.VErrorMessage;
+import com.vaadin.client.ui.Icon;
+import com.vaadin.client.ui.ShortcutActionHandler;
 
 public class VForm extends ComplexPanel implements KeyDownHandler {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java b/client/src/com/vaadin/client/ui/formlayout/FormLayoutConnector.java
index cbe06244af..c1c6cee324 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/formlayout/FormLayoutConnector.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.formlayout;
+package com.vaadin.client.ui.formlayout;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.TooltipInfo;
+import com.vaadin.client.Util;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractFieldConnector;
+import com.vaadin.client.ui.AbstractLayoutConnector;
+import com.vaadin.client.ui.formlayout.VFormLayout.Caption;
+import com.vaadin.client.ui.formlayout.VFormLayout.ErrorFlag;
+import com.vaadin.client.ui.formlayout.VFormLayout.VFormLayoutTable;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.TooltipInfo;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
-import com.vaadin.terminal.gwt.client.ui.formlayout.VFormLayout.Caption;
-import com.vaadin.terminal.gwt.client.ui.formlayout.VFormLayout.ErrorFlag;
-import com.vaadin.terminal.gwt.client.ui.formlayout.VFormLayout.VFormLayoutTable;
 import com.vaadin.ui.FormLayout;
 
 @Connect(FormLayout.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java b/client/src/com/vaadin/client/ui/formlayout/VFormLayout.java
index 7f211aaf9c..890275dfe4 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java
+++ b/client/src/com/vaadin/client/ui/formlayout/VFormLayout.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.formlayout;
+package com.vaadin.client.ui.formlayout;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,16 +28,17 @@ import com.google.gwt.user.client.ui.FlexTable;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.Focusable;
+import com.vaadin.client.StyleConstants;
+import com.vaadin.client.VTooltip;
+import com.vaadin.client.ui.AbstractFieldConnector;
+import com.vaadin.client.ui.Icon;
+import com.vaadin.shared.ComponentConstants;
 import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.ui.MarginInfo;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.StyleConstants;
-import com.vaadin.terminal.gwt.client.VTooltip;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.Icon;
 
 /**
  * Two col Layout that places caption on left col and field on right col
@@ -253,13 +254,14 @@ public class VFormLayout extends SimplePanel {
 
             boolean isEmpty = true;
 
-            if (state.getIcon() != null) {
+            if (state.resources.containsKey(ComponentConstants.ICON_RESOURCE)) {
                 if (icon == null) {
                     icon = new Icon(owner.getConnection());
 
                     DOM.insertChild(getElement(), icon.getElement(), 0);
                 }
-                icon.setUri(state.getIcon().getURL());
+                icon.setUri(state.resources.get(
+                        ComponentConstants.ICON_RESOURCE).getURL());
                 isEmpty = false;
             } else {
                 if (icon != null) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java b/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
index 9a2732e408..16c82c2d21 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java
@@ -13,32 +13,32 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.gridlayout;
+package com.vaadin.client.ui.gridlayout;
 
 import java.util.Iterator;
 
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.DirectionalManagedLayout;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.VCaption;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentContainerConnector;
+import com.vaadin.client.ui.LayoutClickEventHandler;
+import com.vaadin.client.ui.gridlayout.VGridLayout.Cell;
+import com.vaadin.client.ui.layout.VLayoutSlot;
 import com.vaadin.shared.ui.AlignmentInfo;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.LayoutClickRpc;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.gridlayout.GridLayoutServerRpc;
 import com.vaadin.shared.ui.gridlayout.GridLayoutState;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.DirectionalManagedLayout;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.gridlayout.VGridLayout.Cell;
-import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
 import com.vaadin.ui.GridLayout;
 
 @Connect(GridLayout.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/gridlayout/VGridLayout.java b/client/src/com/vaadin/client/ui/gridlayout/VGridLayout.java
index ef44964da7..d3b2f0467e 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/gridlayout/VGridLayout.java
+++ b/client/src/com/vaadin/client/ui/gridlayout/VGridLayout.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.gridlayout;
+package com.vaadin.client.ui.gridlayout;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -28,17 +28,17 @@ import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.VCaption;
+import com.vaadin.client.ui.layout.ComponentConnectorLayoutSlot;
+import com.vaadin.client.ui.layout.VLayoutSlot;
 import com.vaadin.shared.ui.AlignmentInfo;
 import com.vaadin.shared.ui.MarginInfo;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.ui.layout.ComponentConnectorLayoutSlot;
-import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
 
 public class VGridLayout extends ComplexPanel {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/image/ImageConnector.java b/client/src/com/vaadin/client/ui/image/ImageConnector.java
index d36e224a03..7c3eb973d2 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/image/ImageConnector.java
+++ b/client/src/com/vaadin/client/ui/image/ImageConnector.java
@@ -1,16 +1,17 @@
-package com.vaadin.terminal.gwt.client.ui.image;
+package com.vaadin.client.ui.image;
 
 import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.event.dom.client.LoadEvent;
 import com.google.gwt.event.dom.client.LoadHandler;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.ClickEventHandler;
 import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.ui.AbstractEmbeddedState;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.image.ImageServerRpc;
 import com.vaadin.shared.ui.image.ImageState;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
 
 @Connect(com.vaadin.ui.Image.class)
 public class ImageConnector extends AbstractComponentConnector {
@@ -48,8 +49,7 @@ public class ImageConnector extends AbstractComponentConnector {
         clickEventHandler.handleEventHandlerRegistration();
 
         getWidget().setUrl(
-                getState().getSource() != null ? getState().getSource()
-                        .getURL() : null);
+                getResourceUrl(AbstractEmbeddedState.SOURCE_RESOURCE));
         getWidget().setAltText(getState().getAlternateText());
     }
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/image/VImage.java b/client/src/com/vaadin/client/ui/image/VImage.java
index 7e6b77ed4a..51603a2e5f 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/image/VImage.java
+++ b/client/src/com/vaadin/client/ui/image/VImage.java
@@ -1,4 +1,4 @@
-package com.vaadin.terminal.gwt.client.ui.image;
+package com.vaadin.client.ui.image;
 
 import com.google.gwt.user.client.ui.Image;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java b/client/src/com/vaadin/client/ui/label/LabelConnector.java
index 57f8c16952..33ec07b9f2 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java
+++ b/client/src/com/vaadin/client/ui/label/LabelConnector.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.label;
+package com.vaadin.client.ui.label;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.PreElement;
+import com.vaadin.client.Util;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.label.LabelState;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 import com.vaadin.ui.Label;
 
 @Connect(value = Label.class, loadStyle = LoadStyle.EAGER)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java b/client/src/com/vaadin/client/ui/label/VLabel.java
index dc23807166..3874f2adf3 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
+++ b/client/src/com/vaadin/client/ui/label/VLabel.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.label;
+package com.vaadin.client.ui.label;
 
 import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.HTML;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VTooltip;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.Util;
+import com.vaadin.client.VTooltip;
 
 public class VLabel extends HTML {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/layout/ComponentConnectorLayoutSlot.java b/client/src/com/vaadin/client/ui/layout/ComponentConnectorLayoutSlot.java
index b1f381c33d..359be21ac2 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/layout/ComponentConnectorLayoutSlot.java
+++ b/client/src/com/vaadin/client/ui/layout/ComponentConnectorLayoutSlot.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.layout;
+package com.vaadin.client.ui.layout;
 
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.ui.ManagedLayout;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.VCaption;
+import com.vaadin.client.ui.ManagedLayout;
 
 public class ComponentConnectorLayoutSlot extends VLayoutSlot {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeEvent.java b/client/src/com/vaadin/client/ui/layout/ElementResizeEvent.java
index d9733875f3..43ad2d2744 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeEvent.java
+++ b/client/src/com/vaadin/client/ui/layout/ElementResizeEvent.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.layout;
+package com.vaadin.client.ui.layout;
 
 import com.google.gwt.dom.client.Element;
-import com.vaadin.terminal.gwt.client.LayoutManager;
+import com.vaadin.client.LayoutManager;
 
 public class ElementResizeEvent {
     private final Element element;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeListener.java b/client/src/com/vaadin/client/ui/layout/ElementResizeListener.java
index 15b3a5517d..a4a251ad22 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/layout/ElementResizeListener.java
+++ b/client/src/com/vaadin/client/ui/layout/ElementResizeListener.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.layout;
+package com.vaadin.client.ui.layout;
 
 public interface ElementResizeListener {
     public void onElementResize(ElementResizeEvent e);
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/layout/LayoutDependencyTree.java b/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java
index 2bf789fd50..ff2346d5ac 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/layout/LayoutDependencyTree.java
+++ b/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.layout;
+package com.vaadin.client.ui.layout;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,13 +22,13 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ComponentContainerConnector;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ui.ManagedLayout;
 import com.vaadin.shared.ComponentState;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ServerConnector;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ui.ManagedLayout;
 
 public class LayoutDependencyTree {
     private class LayoutDependency {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/layout/Margins.java b/client/src/com/vaadin/client/ui/layout/Margins.java
index 21e35409a0..d77638efe8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/layout/Margins.java
+++ b/client/src/com/vaadin/client/ui/layout/Margins.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.layout;
+package com.vaadin.client.ui.layout;
 
 public class Margins {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/layout/MayScrollChildren.java b/client/src/com/vaadin/client/ui/layout/MayScrollChildren.java
index 336021dbf4..cc2341e26b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/layout/MayScrollChildren.java
+++ b/client/src/com/vaadin/client/ui/layout/MayScrollChildren.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.layout;
+package com.vaadin.client.ui.layout;
 
-import com.vaadin.terminal.gwt.client.ComponentContainerConnector;
+import com.vaadin.client.ComponentContainerConnector;
 
 public interface MayScrollChildren extends ComponentContainerConnector {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java b/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
index 715a24749e..f6e37adabe 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/layout/VLayoutSlot.java
+++ b/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.layout;
+package com.vaadin.client.ui.layout;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Style;
@@ -22,8 +22,8 @@ import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.VCaption;
 import com.vaadin.shared.ui.AlignmentInfo;
-import com.vaadin.terminal.gwt.client.VCaption;
 
 public abstract class VLayoutSlot {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java b/client/src/com/vaadin/client/ui/link/LinkConnector.java
index f2b8361f2b..26e0e78654 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java
+++ b/client/src/com/vaadin/client/ui/link/LinkConnector.java
@@ -14,16 +14,19 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.link;
+package com.vaadin.client.ui.link;
 
 import com.google.gwt.user.client.DOM;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler;
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.Icon;
 import com.vaadin.shared.ui.BorderStyle;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.Icon;
+import com.vaadin.shared.ui.link.LinkConstants;
 import com.vaadin.ui.Link;
 
 @Connect(Link.class)
@@ -31,6 +34,21 @@ public class LinkConnector extends AbstractComponentConnector implements
         Paintable {
 
     @Override
+    protected void init() {
+        super.init();
+        addStateChangeHandler("resources." + LinkConstants.HREF_RESOURCE,
+                new StateChangeHandler() {
+                    @Override
+                    public void onStateChanged(StateChangeEvent stateChangeEvent) {
+                        getWidget().src = getResourceUrl(LinkConstants.HREF_RESOURCE);
+                        getWidget().anchor
+                                .setAttribute("href", getWidget().src);
+
+                    }
+                });
+    }
+
+    @Override
     public boolean delegateCaptionHandling() {
         return false;
     }
@@ -50,11 +68,6 @@ public class LinkConnector extends AbstractComponentConnector implements
             getWidget().target = uidl.getStringAttribute("name");
             getWidget().anchor.setAttribute("target", getWidget().target);
         }
-        if (uidl.hasAttribute("src")) {
-            getWidget().src = client.translateVaadinUri(uidl
-                    .getStringAttribute("src"));
-            getWidget().anchor.setAttribute("href", getWidget().src);
-        }
 
         if (uidl.hasAttribute("border")) {
             if ("none".equals(uidl.getStringAttribute("border"))) {
@@ -88,13 +101,13 @@ public class LinkConnector extends AbstractComponentConnector implements
                     "none");
         }
 
-        if (getState().getIcon() != null) {
+        if (getIcon() != null) {
             if (getWidget().icon == null) {
                 getWidget().icon = new Icon(client);
                 getWidget().anchor.insertBefore(getWidget().icon.getElement(),
                         getWidget().captionElement);
             }
-            getWidget().icon.setUri(getState().getIcon().getURL());
+            getWidget().icon.setUri(getIcon());
         }
 
     }
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/link/VLink.java b/client/src/com/vaadin/client/ui/link/VLink.java
index b0e44c9d13..54794ac0dc 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/link/VLink.java
+++ b/client/src/com/vaadin/client/ui/link/VLink.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.link;
+package com.vaadin.client.ui.link;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -23,10 +23,10 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.HTML;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.Icon;
 import com.vaadin.shared.ui.BorderStyle;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.Icon;
 
 public class VLink extends HTML implements ClickHandler {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java b/client/src/com/vaadin/client/ui/listselect/ListSelectConnector.java
index 4d34c21546..640521e170 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java
+++ b/client/src/com/vaadin/client/ui/listselect/ListSelectConnector.java
@@ -14,10 +14,10 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.listselect;
+package com.vaadin.client.ui.listselect;
 
+import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.ui.ListSelect;
 
 @Connect(ListSelect.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/listselect/VListSelect.java b/client/src/com/vaadin/client/ui/listselect/VListSelect.java
index 06099d296c..520995012e 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/listselect/VListSelect.java
+++ b/client/src/com/vaadin/client/ui/listselect/VListSelect.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.listselect;
+package com.vaadin.client.ui.listselect;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
 import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.user.client.ui.ListBox;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.optiongroup.VOptionGroupBase;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.optiongroup.VOptionGroupBase;
 
 public class VListSelect extends VOptionGroupBase {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBar.java b/client/src/com/vaadin/client/ui/menubar/MenuBar.java
index c69845d33b..c5ea865e2f 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBar.java
+++ b/client/src/com/vaadin/client/ui/menubar/MenuBar.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.menubar;
+package com.vaadin.client.ui.menubar;
 
 /*
  * Copyright 2007 Google Inc.
@@ -44,7 +44,7 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.PopupListener;
 import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
+import com.vaadin.client.ui.VOverlay;
 
 /**
  * A standard menu bar widget. A menu bar can contain any number of menu items,
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java b/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java
index 372a420203..d187468ee5 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java
+++ b/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.menubar;
+package com.vaadin.client.ui.menubar;
 
 import java.util.Iterator;
 import java.util.Stack;
@@ -21,17 +21,17 @@ import java.util.Stack;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.Command;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.TooltipInfo;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.Icon;
+import com.vaadin.client.ui.SimpleManagedLayout;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.menubar.MenuBarConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.TooltipInfo;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.Icon;
-import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
 
 @Connect(value = com.vaadin.ui.MenuBar.class, loadStyle = LoadStyle.LAZY)
 public class MenuBarConnector extends AbstractComponentConnector implements
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuItem.java b/client/src/com/vaadin/client/ui/menubar/MenuItem.java
index 9579f5a9b0..3a257df97f 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuItem.java
+++ b/client/src/com/vaadin/client/ui/menubar/MenuItem.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.menubar;
+package com.vaadin.client.ui.menubar;
 
 /*
  * Copyright 2007 Google Inc.
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java b/client/src/com/vaadin/client/ui/menubar/VMenuBar.java
index fe47fcca66..a4878724a8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java
+++ b/client/src/com/vaadin/client/ui/menubar/VMenuBar.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.menubar;
+package com.vaadin.client.ui.menubar;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,22 +42,22 @@ import com.google.gwt.user.client.ui.HasHTML;
 import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.TooltipInfo;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.Icon;
+import com.vaadin.client.ui.SimpleFocusablePanel;
+import com.vaadin.client.ui.SubPartAware;
+import com.vaadin.client.ui.VLazyExecutor;
+import com.vaadin.client.ui.VOverlay;
 import com.vaadin.shared.ui.menubar.MenuBarConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.TooltipInfo;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.Icon;
-import com.vaadin.terminal.gwt.client.ui.SimpleFocusablePanel;
-import com.vaadin.terminal.gwt.client.ui.SubPartAware;
-import com.vaadin.terminal.gwt.client.ui.VLazyExecutor;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
 
 public class VMenuBar extends SimpleFocusablePanel implements
-CloseHandler<PopupPanel>, KeyPressHandler, KeyDownHandler,
-FocusHandler, SubPartAware {
+        CloseHandler<PopupPanel>, KeyPressHandler, KeyDownHandler,
+        FocusHandler, SubPartAware {
 
     // The hierarchy of VMenuBar is a bit weird as VMenuBar is the Paintable,
     // used for the root menu but also used for the sub menus.
@@ -94,11 +94,11 @@ FocusHandler, SubPartAware {
     private VLazyExecutor iconLoadedExecutioner = new VLazyExecutor(100,
             new ScheduledCommand() {
 
-        @Override
-        public void execute() {
-            iLayout(true);
-        }
-    });
+                @Override
+                public void execute() {
+                    iLayout(true);
+                }
+            });
 
     boolean openRootOnHover;
 
@@ -188,7 +188,7 @@ FocusHandler, SubPartAware {
                 itemHTML.append("<img src=\""
                         + Util.escapeAttribute(client.translateVaadinUri(item
                                 .getStringAttribute("icon"))) + "\" class=\""
-                                + Icon.CLASSNAME + "\" alt=\"\" />");
+                        + Icon.CLASSNAME + "\" alt=\"\" />");
             }
             String itemText = item.getStringAttribute("text");
             if (!htmlContentAllowed) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java b/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java
index 2f2c66d1ed..e821ae1422 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java
+++ b/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.nativebutton;
+package com.vaadin.client.ui.nativebutton;
 
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.BlurHandler;
@@ -21,15 +21,15 @@ import com.google.gwt.event.dom.client.FocusEvent;
 import com.google.gwt.event.dom.client.FocusHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.DOM;
+import com.vaadin.client.EventHelper;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.Icon;
 import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.button.ButtonServerRpc;
 import com.vaadin.shared.ui.button.ButtonState;
-import com.vaadin.terminal.gwt.client.EventHelper;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.Icon;
 import com.vaadin.ui.NativeButton;
 
 @Connect(NativeButton.class)
@@ -91,14 +91,14 @@ public class NativeButtonConnector extends AbstractComponentConnector implements
             getWidget().errorIndicatorElement = null;
         }
 
-        if (getState().getIcon() != null) {
+        if (getIcon() != null) {
             if (getWidget().icon == null) {
                 getWidget().icon = new Icon(getConnection());
                 getWidget().getElement().insertBefore(
                         getWidget().icon.getElement(),
                         getWidget().captionElement);
             }
-            getWidget().icon.setUri(getState().getIcon().getURL());
+            getWidget().icon.setUri(getIcon());
         } else {
             if (getWidget().icon != null) {
                 getWidget().getElement().removeChild(
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/nativebutton/VNativeButton.java b/client/src/com/vaadin/client/ui/nativebutton/VNativeButton.java
index 1ab16eccc4..d8cb2e28c9 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/nativebutton/VNativeButton.java
+++ b/client/src/com/vaadin/client/ui/nativebutton/VNativeButton.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.nativebutton;
+package com.vaadin.client.ui.nativebutton;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.dom.client.ClickEvent;
@@ -22,13 +22,13 @@ import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Button;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.MouseEventDetailsBuilder;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.Icon;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.button.ButtonServerRpc;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.Icon;
 
 public class VNativeButton extends Button implements ClickHandler {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java b/client/src/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java
index e88ed8b2f3..e579f9c241 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java
+++ b/client/src/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java
@@ -14,10 +14,10 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.nativeselect;
+package com.vaadin.client.ui.nativeselect;
 
+import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.ui.NativeSelect;
 
 @Connect(NativeSelect.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/nativeselect/VNativeSelect.java b/client/src/com/vaadin/client/ui/nativeselect/VNativeSelect.java
index eb77f5f113..876bf27080 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/nativeselect/VNativeSelect.java
+++ b/client/src/com/vaadin/client/ui/nativeselect/VNativeSelect.java
@@ -14,16 +14,16 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.nativeselect;
+package com.vaadin.client.ui.nativeselect;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
 import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.user.client.ui.ListBox;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Field;
-import com.vaadin.terminal.gwt.client.ui.optiongroup.VOptionGroupBase;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.Field;
+import com.vaadin.client.ui.optiongroup.VOptionGroupBase;
 
 public class VNativeSelect extends VOptionGroupBase implements Field {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java b/client/src/com/vaadin/client/ui/notification/VNotification.java
index b668c9a88c..44dfaffd6e 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java
+++ b/client/src/com/vaadin/client/ui/notification/VNotification.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.notification;
+package com.vaadin.client.ui.notification;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -29,13 +29,13 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.VOverlay;
 import com.vaadin.shared.Position;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
 
 public class VNotification extends VOverlay {
 
@@ -386,8 +386,7 @@ public class VNotification extends VOverlay {
         boolean onlyPlainText = notification
                 .hasAttribute(UIConstants.NOTIFICATION_HTML_CONTENT_NOT_ALLOWED);
         String html = "";
-        if (notification
-                .hasAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_ICON)) {
+        if (notification.hasAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_ICON)) {
             final String parsedUri = client
                     .translateVaadinUri(notification
                             .getStringAttribute(UIConstants.ATTRIBUTE_NOTIFICATION_ICON));
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupBaseConnector.java b/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java
index 4eabdabb36..9367176c76 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupBaseConnector.java
+++ b/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.optiongroup;
-
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.nativebutton.VNativeButton;
-import com.vaadin.terminal.gwt.client.ui.textfield.VTextField;
+package com.vaadin.client.ui.optiongroup;
+
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.AbstractFieldConnector;
+import com.vaadin.client.ui.nativebutton.VNativeButton;
+import com.vaadin.client.ui.textfield.VTextField;
 
 public abstract class OptionGroupBaseConnector extends AbstractFieldConnector
         implements Paintable {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java b/client/src/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java
index a15ad3b163..b6581a8c02 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java
+++ b/client/src/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java
@@ -14,18 +14,18 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.optiongroup;
+package com.vaadin.client.ui.optiongroup;
 
 import java.util.ArrayList;
 
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.ui.CheckBox;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.UIDL;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.optiongroup.OptionGroupConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.ui.OptionGroup;
 
 @Connect(OptionGroup.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java b/client/src/com/vaadin/client/ui/optiongroup/VOptionGroup.java
index 710a1c8e63..43bdee162d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java
+++ b/client/src/com/vaadin/client/ui/optiongroup/VOptionGroup.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.optiongroup;
+package com.vaadin.client.ui.optiongroup;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -37,13 +37,13 @@ import com.google.gwt.user.client.ui.Focusable;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.RadioButton;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.Icon;
+import com.vaadin.client.ui.checkbox.VCheckBox;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.optiongroup.OptionGroupConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.Icon;
-import com.vaadin.terminal.gwt.client.ui.checkbox.VCheckBox;
 
 public class VOptionGroup extends VOptionGroupBase implements FocusHandler,
         BlurHandler {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroupBase.java b/client/src/com/vaadin/client/ui/optiongroup/VOptionGroupBase.java
index e416e85696..87f1cc53f0 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroupBase.java
+++ b/client/src/com/vaadin/client/ui/optiongroup/VOptionGroupBase.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.optiongroup;
+package com.vaadin.client.ui.optiongroup;
 
 import java.util.Set;
 
@@ -29,12 +29,12 @@ import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Field;
-import com.vaadin.terminal.gwt.client.ui.nativebutton.VNativeButton;
-import com.vaadin.terminal.gwt.client.ui.textfield.VTextField;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Focusable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.Field;
+import com.vaadin.client.ui.nativebutton.VNativeButton;
+import com.vaadin.client.ui.textfield.VTextField;
 
 public abstract class VOptionGroupBase extends Composite implements Field,
         ClickHandler, ChangeHandler, KeyPressHandler, Focusable {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractBoxLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractBoxLayoutConnector.java
index 82bf4e0108..a4fcea81f5 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractBoxLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractBoxLayoutConnector.java
@@ -1,7 +1,7 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+package com.vaadin.client.ui.orderedlayout;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -9,28 +9,30 @@ import java.util.List;
 
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.Element;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.Util;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler;
+import com.vaadin.client.ui.AbstractFieldConnector;
+import com.vaadin.client.ui.AbstractLayoutConnector;
+import com.vaadin.client.ui.LayoutClickEventHandler;
+import com.vaadin.client.ui.layout.ElementResizeEvent;
+import com.vaadin.client.ui.layout.ElementResizeListener;
+import com.vaadin.client.ui.orderedlayout.VBoxLayout.CaptionPosition;
+import com.vaadin.client.ui.orderedlayout.VBoxLayout.Slot;
 import com.vaadin.shared.AbstractFieldState;
+import com.vaadin.shared.ComponentConstants;
+import com.vaadin.shared.communication.URLReference;
 import com.vaadin.shared.ui.AlignmentInfo;
 import com.vaadin.shared.ui.LayoutClickRpc;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutServerRpc;
 import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeEvent;
-import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeListener;
-import com.vaadin.terminal.gwt.client.ui.orderedlayout.VBoxLayout.CaptionPosition;
-import com.vaadin.terminal.gwt.client.ui.orderedlayout.VBoxLayout.Slot;
 
 public abstract class AbstractBoxLayoutConnector extends
-AbstractLayoutConnector /* implements PostLayoutListener */{
+        AbstractLayoutConnector /* implements PostLayoutListener */{
 
     AbstractOrderedLayoutServerRpc rpc;
 
@@ -105,9 +107,11 @@ AbstractLayoutConnector /* implements PostLayoutListener */{
     public void updateCaption(ComponentConnector child) {
         Slot slot = getWidget().getSlot(child);
 
+
         String caption = child.getState().getCaption();
-        String iconUrl = child.getState().getIcon() != null ? child.getState()
-                .getIcon().getURL() : null;
+        URLReference iconUrl = child.getState().resources
+                .get(ComponentConstants.ICON_RESOURCE);
+        String iconUrlString = iconUrl != null ? iconUrl.toString() : null;
                 List<String> styles = child.getState().getStyles();
                 String error = child.getState().getErrorMessage();
                 boolean showError = error != null;
@@ -122,7 +126,8 @@ AbstractLayoutConnector /* implements PostLayoutListener */{
                 }
                 boolean enabled = child.getState().isEnabled();
 
-                slot.setCaption(caption, iconUrl, styles, error, showError, required,
+        slot.setCaption(caption, iconUrlString, styles, error, showError,
+                required,
                         enabled);
 
                 slot.setRelativeWidth(child.isRelativeWidth());
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
index 122547ddb4..d7cae9195f 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+package com.vaadin.client.ui.orderedlayout;
 
 import java.util.List;
 
@@ -21,23 +21,23 @@ import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.DirectionalManagedLayout;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.Util;
+import com.vaadin.client.VCaption;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractLayoutConnector;
+import com.vaadin.client.ui.LayoutClickEventHandler;
+import com.vaadin.client.ui.layout.ComponentConnectorLayoutSlot;
+import com.vaadin.client.ui.layout.VLayoutSlot;
 import com.vaadin.shared.ui.AlignmentInfo;
 import com.vaadin.shared.ui.LayoutClickRpc;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutServerRpc;
 import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.DirectionalManagedLayout;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.layout.ComponentConnectorLayoutSlot;
-import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
 
 public abstract class AbstractOrderedLayoutConnector extends
         AbstractLayoutConnector implements DirectionalManagedLayout {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalBoxLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/HorizontalBoxLayoutConnector.java
index d18ea8a178..13e133dfa7 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalBoxLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/HorizontalBoxLayoutConnector.java
@@ -1,7 +1,7 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+package com.vaadin.client.ui.orderedlayout;
 
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java
index f22b558afd..a86baf9cea 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+package com.vaadin.client.ui.orderedlayout;
 
 
 //@Connect(value = HorizontalLayout.class, loadStyle = LoadStyle.EAGER)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VBoxLayout.java b/client/src/com/vaadin/client/ui/orderedlayout/VBoxLayout.java
index cd6a5f0d51..e04ef93444 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VBoxLayout.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/VBoxLayout.java
@@ -1,7 +1,7 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+package com.vaadin.client.ui.orderedlayout;
 
 import java.util.HashMap;
 import java.util.List;
@@ -19,10 +19,10 @@ import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.UIObject;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.LayoutManager;
 import com.vaadin.shared.ui.AlignmentInfo;
 import com.vaadin.shared.ui.MarginInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.LayoutManager;
 import com.vaadin.ui.themes.BaseTheme;
 
 public class VBoxLayout extends FlowPanel {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java b/client/src/com/vaadin/client/ui/orderedlayout/VHorizontalLayout.java
index 917384e72d..c72c44262b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VHorizontalLayout.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/VHorizontalLayout.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+package com.vaadin.client.ui.orderedlayout;
 
 public class VHorizontalLayout extends VMeasuringOrderedLayout {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VMeasuringOrderedLayout.java b/client/src/com/vaadin/client/ui/orderedlayout/VMeasuringOrderedLayout.java
index ee55bc07ba..94dfe2242e 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VMeasuringOrderedLayout.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/VMeasuringOrderedLayout.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+package com.vaadin.client.ui.orderedlayout;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -27,9 +27,9 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.WidgetCollection;
+import com.vaadin.client.VCaption;
+import com.vaadin.client.ui.layout.VLayoutSlot;
 import com.vaadin.shared.ui.MarginInfo;
-import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
 
 public class VMeasuringOrderedLayout extends ComplexPanel {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java b/client/src/com/vaadin/client/ui/orderedlayout/VVerticalLayout.java
index 5c396882f9..76e5910bed 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VVerticalLayout.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/VVerticalLayout.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+package com.vaadin.client.ui.orderedlayout;
 
 public class VVerticalLayout extends VMeasuringOrderedLayout {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalBoxLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/VerticalBoxLayoutConnector.java
index a480a79b2e..5d1e1d9eee 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalBoxLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/VerticalBoxLayoutConnector.java
@@ -1,7 +1,7 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+package com.vaadin.client.ui.orderedlayout;
 
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java
index c53494775c..455c645144 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+package com.vaadin.client.ui.orderedlayout;
 
 
 //@Connect(value = VerticalLayout.class, loadStyle = LoadStyle.EAGER)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java b/client/src/com/vaadin/client/ui/panel/PanelConnector.java
index c6a695bc2e..f991d295b4 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
+++ b/client/src/com/vaadin/client/ui/panel/PanelConnector.java
@@ -13,29 +13,29 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.panel;
+package com.vaadin.client.ui.panel;
 
 import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.ui.AbstractComponentContainerConnector;
+import com.vaadin.client.ui.ClickEventHandler;
+import com.vaadin.client.ui.PostLayoutListener;
+import com.vaadin.client.ui.ShortcutActionHandler;
+import com.vaadin.client.ui.SimpleManagedLayout;
+import com.vaadin.client.ui.layout.MayScrollChildren;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.panel.PanelServerRpc;
 import com.vaadin.shared.ui.panel.PanelState;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
-import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
-import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
 import com.vaadin.ui.Panel;
 
 @Connect(Panel.class)
@@ -140,8 +140,8 @@ public class PanelConnector extends AbstractComponentContainerConnector
         getWidget().client = client;
         getWidget().id = uidl.getId();
 
-        if (getState().getIcon() != null) {
-            getWidget().setIconUri(getState().getIcon().getURL(), client);
+        if (getIcon() != null) {
+            getWidget().setIconUri(getIcon(), client);
         } else {
             getWidget().setIconUri(null, client);
         }
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java b/client/src/com/vaadin/client/ui/panel/VPanel.java
index b7a9f3f7c2..90951684a7 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/panel/VPanel.java
+++ b/client/src/com/vaadin/client/ui/panel/VPanel.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.panel;
+package com.vaadin.client.ui.panel;
 
 import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.Document;
@@ -22,13 +22,13 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.SimplePanel;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.ui.Icon;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate.TouchScrollHandler;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Focusable;
+import com.vaadin.client.ui.Icon;
+import com.vaadin.client.ui.ShortcutActionHandler;
+import com.vaadin.client.ui.TouchScrollDelegate;
+import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler;
 
 public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner,
         Focusable {
@@ -109,7 +109,7 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.Focusable#focus()
+     * @see com.vaadin.client.Focusable#focus()
      */
 
     @Override
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java b/client/src/com/vaadin/client/ui/passwordfield/PasswordFieldConnector.java
index e8aa32f78b..35e555c5f0 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java
+++ b/client/src/com/vaadin/client/ui/passwordfield/PasswordFieldConnector.java
@@ -14,10 +14,10 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.passwordfield;
+package com.vaadin.client.ui.passwordfield;
 
+import com.vaadin.client.ui.textfield.TextFieldConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ui.textfield.TextFieldConnector;
 import com.vaadin.ui.PasswordField;
 
 @Connect(PasswordField.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/passwordfield/VPasswordField.java b/client/src/com/vaadin/client/ui/passwordfield/VPasswordField.java
index fc131909b2..4713bc20d8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/passwordfield/VPasswordField.java
+++ b/client/src/com/vaadin/client/ui/passwordfield/VPasswordField.java
@@ -14,10 +14,10 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.passwordfield;
+package com.vaadin.client.ui.passwordfield;
 
 import com.google.gwt.user.client.DOM;
-import com.vaadin.terminal.gwt.client.ui.textfield.VTextField;
+import com.vaadin.client.ui.textfield.VTextField;
 
 /**
  * This class represents a password field.
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java b/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java
index 398e257375..5a4950cc0a 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java
+++ b/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java
@@ -1,5 +1,5 @@
 /*
-  * Copyright 2011 Vaadin Ltd.
+ * Copyright 2011 Vaadin Ltd.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.popupview;
+package com.vaadin.client.ui.popupview;
 
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.VCaption;
+import com.vaadin.client.VCaptionWrapper;
+import com.vaadin.client.ui.AbstractComponentContainerConnector;
+import com.vaadin.client.ui.PostLayoutListener;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.VCaptionWrapper;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
 import com.vaadin.ui.PopupView;
 
 @Connect(PopupView.class)
@@ -40,8 +40,8 @@ public class PopupViewConnector extends AbstractComponentContainerConnector
     /**
      * 
      * 
-     * @see com.vaadin.terminal.gwt.client.ComponentConnector#updateFromUIDL(com.vaadin.terminal.gwt.client.UIDL,
-     *      com.vaadin.terminal.gwt.client.ApplicationConnection)
+     * @see com.vaadin.client.ComponentConnector#updateFromUIDL(com.vaadin.client.UIDL,
+     *      com.vaadin.client.ApplicationConnection)
      */
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java b/client/src/com/vaadin/client/ui/popupview/VPopupView.java
index df373c59ba..20783fe9d9 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/popupview/VPopupView.java
+++ b/client/src/com/vaadin/client/ui/popupview/VPopupView.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.popupview;
+package com.vaadin.client.ui.popupview;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -36,15 +36,15 @@ import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.VCaptionWrapper;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
-import com.vaadin.terminal.gwt.client.ui.richtextarea.VRichTextArea;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.VCaptionWrapper;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ui.ShortcutActionHandler;
+import com.vaadin.client.ui.VOverlay;
+import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.client.ui.richtextarea.VRichTextArea;
 
 public class VPopupView extends HTML {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java b/client/src/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java
index e99a03f01d..d75bc8d0c3 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java
+++ b/client/src/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.progressindicator;
+package com.vaadin.client.ui.progressindicator;
 
 import com.google.gwt.user.client.DOM;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.AbstractFieldConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
 import com.vaadin.ui.ProgressIndicator;
 
 @Connect(ProgressIndicator.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/progressindicator/VProgressIndicator.java b/client/src/com/vaadin/client/ui/progressindicator/VProgressIndicator.java
index 5d39389d5b..f090cbee5f 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/progressindicator/VProgressIndicator.java
+++ b/client/src/com/vaadin/client/ui/progressindicator/VProgressIndicator.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.progressindicator;
+package com.vaadin.client.ui.progressindicator;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Util;
 
 public class VProgressIndicator extends Widget {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java b/client/src/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java
index 9726d43297..b5c5e0d88b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java
+++ b/client/src/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.richtextarea;
+package com.vaadin.client.ui.richtextarea;
 
 import com.google.gwt.user.client.Event;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.AbstractFieldConnector;
+import com.vaadin.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 import com.vaadin.ui.RichTextArea;
 
 @Connect(value = RichTextArea.class, loadStyle = LoadStyle.LAZY)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java b/client/src/com/vaadin/client/ui/richtextarea/VRichTextArea.java
index cdd5025e64..785d65ea10 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java
+++ b/client/src/com/vaadin/client/ui/richtextarea/VRichTextArea.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.richtextarea;
+package com.vaadin.client.ui.richtextarea;
 
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.event.dom.client.BlurEvent;
@@ -36,14 +36,14 @@ import com.google.gwt.user.client.ui.Focusable;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.RichTextArea;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.Field;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.Field;
+import com.vaadin.client.ui.ShortcutActionHandler;
+import com.vaadin.client.ui.TouchScrollDelegate;
+import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
 
 /**
  * This class implements a basic client side rich text editor component.
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar$Strings.properties b/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar$Strings.properties
index 363b704584..363b704584 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar$Strings.properties
+++ b/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar$Strings.properties
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java b/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java
index 3128b4d842..840fb3b309 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java
+++ b/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java
@@ -28,7 +28,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.richtextarea;
+package com.vaadin.client.ui.richtextarea;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ChangeEvent;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/backColors.gif b/client/src/com/vaadin/client/ui/richtextarea/backColors.gif
index ddfc1cea2c..ddfc1cea2c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/backColors.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/backColors.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/bold.gif b/client/src/com/vaadin/client/ui/richtextarea/bold.gif
index 7c22eaac68..7c22eaac68 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/bold.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/bold.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/createLink.gif b/client/src/com/vaadin/client/ui/richtextarea/createLink.gif
index 1a1412fe0e..1a1412fe0e 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/createLink.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/createLink.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fontSizes.gif b/client/src/com/vaadin/client/ui/richtextarea/fontSizes.gif
index c2f4c8cb21..c2f4c8cb21 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fontSizes.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/fontSizes.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fonts.gif b/client/src/com/vaadin/client/ui/richtextarea/fonts.gif
index 1629cabb78..1629cabb78 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fonts.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/fonts.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/foreColors.gif b/client/src/com/vaadin/client/ui/richtextarea/foreColors.gif
index 2bb89ef189..2bb89ef189 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/foreColors.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/foreColors.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/gwtLogo.png b/client/src/com/vaadin/client/ui/richtextarea/gwtLogo.png
index 80728186d8..80728186d8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/gwtLogo.png
+++ b/client/src/com/vaadin/client/ui/richtextarea/gwtLogo.png
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/hr.gif b/client/src/com/vaadin/client/ui/richtextarea/hr.gif
index d507082cf1..d507082cf1 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/hr.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/hr.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/indent.gif b/client/src/com/vaadin/client/ui/richtextarea/indent.gif
index 905421ed76..905421ed76 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/indent.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/indent.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/insertImage.gif b/client/src/com/vaadin/client/ui/richtextarea/insertImage.gif
index 394ec432a5..394ec432a5 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/insertImage.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/insertImage.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/italic.gif b/client/src/com/vaadin/client/ui/richtextarea/italic.gif
index ffe0e97284..ffe0e97284 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/italic.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/italic.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyCenter.gif b/client/src/com/vaadin/client/ui/richtextarea/justifyCenter.gif
index f7d4c4693d..f7d4c4693d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyCenter.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/justifyCenter.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyLeft.gif b/client/src/com/vaadin/client/ui/richtextarea/justifyLeft.gif
index bc37a3ed5a..bc37a3ed5a 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyLeft.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/justifyLeft.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyRight.gif b/client/src/com/vaadin/client/ui/richtextarea/justifyRight.gif
index 892d569384..892d569384 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyRight.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/justifyRight.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ol.gif b/client/src/com/vaadin/client/ui/richtextarea/ol.gif
index 54f8e4f551..54f8e4f551 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ol.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/ol.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/outdent.gif b/client/src/com/vaadin/client/ui/richtextarea/outdent.gif
index 78fd1b5722..78fd1b5722 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/outdent.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/outdent.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeFormat.gif b/client/src/com/vaadin/client/ui/richtextarea/removeFormat.gif
index cf92c9774f..cf92c9774f 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeFormat.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/removeFormat.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeLink.gif b/client/src/com/vaadin/client/ui/richtextarea/removeLink.gif
index 40721a7bca..40721a7bca 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeLink.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/removeLink.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/strikeThrough.gif b/client/src/com/vaadin/client/ui/richtextarea/strikeThrough.gif
index a7a233c023..a7a233c023 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/strikeThrough.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/strikeThrough.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/subscript.gif b/client/src/com/vaadin/client/ui/richtextarea/subscript.gif
index 58b6fbb816..58b6fbb816 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/subscript.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/subscript.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/superscript.gif b/client/src/com/vaadin/client/ui/richtextarea/superscript.gif
index a6270f6e21..a6270f6e21 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/superscript.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/superscript.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ul.gif b/client/src/com/vaadin/client/ui/richtextarea/ul.gif
index 83f1562bcb..83f1562bcb 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ul.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/ul.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/underline.gif b/client/src/com/vaadin/client/ui/richtextarea/underline.gif
index 06f0200fdd..06f0200fdd 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/richtextarea/underline.gif
+++ b/client/src/com/vaadin/client/ui/richtextarea/underline.gif
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java b/client/src/com/vaadin/client/ui/slider/SliderConnector.java
index 53f3b8874b..ab9a618c6d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java
+++ b/client/src/com/vaadin/client/ui/slider/SliderConnector.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.slider;
+package com.vaadin.client.ui.slider;
 
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
 import com.google.gwt.event.logical.shared.ValueChangeHandler;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractFieldConnector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.slider.SliderServerRpc;
 import com.vaadin.shared.ui.slider.SliderState;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
 import com.vaadin.ui.Slider;
 
 @Connect(Slider.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java b/client/src/com/vaadin/client/ui/slider/VSlider.java
index d9801626b4..5a694784b8 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/slider/VSlider.java
+++ b/client/src/com/vaadin/client/ui/slider/VSlider.java
@@ -14,7 +14,7 @@
  * the License.
  */
 // 
-package com.vaadin.terminal.gwt.client.ui.slider;
+package com.vaadin.client.ui.slider;
 
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
@@ -29,16 +29,16 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HasValue;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ContainerResizedListener;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ui.Field;
+import com.vaadin.client.ui.SimpleFocusablePanel;
+import com.vaadin.client.ui.VLazyExecutor;
+import com.vaadin.client.ui.VOverlay;
 import com.vaadin.shared.ui.slider.SliderOrientation;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ContainerResizedListener;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ui.Field;
-import com.vaadin.terminal.gwt.client.ui.SimpleFocusablePanel;
-import com.vaadin.terminal.gwt.client.ui.VLazyExecutor;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
 
 public class VSlider extends SimpleFocusablePanel implements Field,
         ContainerResizedListener, HasValue<Double> {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java b/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java
index 912f9a7c83..19b1129aea 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelConnector.java
+++ b/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.splitpanel;
+package com.vaadin.client.ui.splitpanel;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -26,20 +26,20 @@ import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentContainerConnector;
+import com.vaadin.client.ui.ClickEventHandler;
+import com.vaadin.client.ui.SimpleManagedLayout;
+import com.vaadin.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler;
+import com.vaadin.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler.SplitterMoveEvent;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelRpc;
 import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState;
 import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState.SplitterState;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
-import com.vaadin.terminal.gwt.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler;
-import com.vaadin.terminal.gwt.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler.SplitterMoveEvent;
 
 public abstract class AbstractSplitPanelConnector extends
         AbstractComponentContainerConnector implements SimpleManagedLayout {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java b/client/src/com/vaadin/client/ui/splitpanel/HorizontalSplitPanelConnector.java
index 3165e13407..c07bb59289 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java
+++ b/client/src/com/vaadin/client/ui/splitpanel/HorizontalSplitPanelConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.splitpanel;
+package com.vaadin.client.ui.splitpanel;
 
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java b/client/src/com/vaadin/client/ui/splitpanel/VAbstractSplitPanel.java
index b83108b34c..31bc69ec3f 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
+++ b/client/src/com/vaadin/client/ui/splitpanel/VAbstractSplitPanel.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.splitpanel;
+package com.vaadin.client.ui.splitpanel;
 
 import java.util.Collections;
 import java.util.List;
@@ -36,17 +36,17 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate.TouchScrollHandler;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
-import com.vaadin.terminal.gwt.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler.SplitterMoveEvent;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ui.TouchScrollDelegate;
+import com.vaadin.client.ui.VOverlay;
+import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler;
+import com.vaadin.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler.SplitterMoveEvent;
 
 public class VAbstractSplitPanel extends ComplexPanel {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java b/client/src/com/vaadin/client/ui/splitpanel/VSplitPanelHorizontal.java
index 7016620e2d..f347a8521c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelHorizontal.java
+++ b/client/src/com/vaadin/client/ui/splitpanel/VSplitPanelHorizontal.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.splitpanel;
+package com.vaadin.client.ui.splitpanel;
 
 public class VSplitPanelHorizontal extends VAbstractSplitPanel {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java b/client/src/com/vaadin/client/ui/splitpanel/VSplitPanelVertical.java
index 02397ea4c6..3f9826833b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VSplitPanelVertical.java
+++ b/client/src/com/vaadin/client/ui/splitpanel/VSplitPanelVertical.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.splitpanel;
+package com.vaadin.client.ui.splitpanel;
 
 public class VSplitPanelVertical extends VAbstractSplitPanel {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java b/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java
index ab4ea350ce..50a5465e07 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java
+++ b/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.splitpanel;
+package com.vaadin.client.ui.splitpanel;
 
 import com.google.gwt.core.client.GWT;
 import com.vaadin.shared.ui.Connect;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java b/client/src/com/vaadin/client/ui/table/TableConnector.java
index 77d3fa61d5..891d4880b3 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java
+++ b/client/src/com/vaadin/client/ui/table/TableConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.table;
+package com.vaadin.client.ui.table;
 
 import java.util.Iterator;
 
@@ -23,22 +23,22 @@ import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Style.Position;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.DirectionalManagedLayout;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.TooltipInfo;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.AbstractComponentContainerConnector;
+import com.vaadin.client.ui.PostLayoutListener;
+import com.vaadin.client.ui.table.VScrollTable.ContextMenuDetails;
+import com.vaadin.client.ui.table.VScrollTable.VScrollTableBody.VScrollTableRow;
 import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.table.TableConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.DirectionalManagedLayout;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.ServerConnector;
-import com.vaadin.terminal.gwt.client.TooltipInfo;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
-import com.vaadin.terminal.gwt.client.ui.table.VScrollTable.ContextMenuDetails;
-import com.vaadin.terminal.gwt.client.ui.table.VScrollTable.VScrollTableBody.VScrollTableRow;
 
 @Connect(com.vaadin.ui.Table.class)
 public class TableConnector extends AbstractComponentContainerConnector
@@ -53,9 +53,8 @@ public class TableConnector extends AbstractComponentContainerConnector
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.gwt.client.Paintable#updateFromUIDL(com.vaadin.terminal
-     * .gwt.client.UIDL, com.vaadin.terminal.gwt.client.ApplicationConnection)
+     * @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.client.UIDL,
+     * com.vaadin.client.ApplicationConnection)
      */
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java b/client/src/com/vaadin/client/ui/table/VScrollTable.java
index eda3f7090f..633f60be23 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/table/VScrollTable.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.table;
+package com.vaadin.client.ui.table;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -72,37 +72,37 @@ import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.UIObject;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.Focusable;
+import com.vaadin.client.MouseEventDetailsBuilder;
+import com.vaadin.client.TooltipInfo;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.VTooltip;
+import com.vaadin.client.ui.Action;
+import com.vaadin.client.ui.ActionOwner;
+import com.vaadin.client.ui.FocusableScrollPanel;
+import com.vaadin.client.ui.TouchScrollDelegate;
+import com.vaadin.client.ui.TreeAction;
+import com.vaadin.client.ui.dd.DDUtil;
+import com.vaadin.client.ui.dd.VAbstractDropHandler;
+import com.vaadin.client.ui.dd.VAcceptCallback;
+import com.vaadin.client.ui.dd.VDragAndDropManager;
+import com.vaadin.client.ui.dd.VDragEvent;
+import com.vaadin.client.ui.dd.VHasDropHandler;
+import com.vaadin.client.ui.dd.VTransferable;
+import com.vaadin.client.ui.embedded.VEmbedded;
+import com.vaadin.client.ui.label.VLabel;
+import com.vaadin.client.ui.table.VScrollTable.VScrollTableBody.VScrollTableRow;
+import com.vaadin.client.ui.textfield.VTextField;
 import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.shared.ui.table.TableConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
-import com.vaadin.terminal.gwt.client.TooltipInfo;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.VTooltip;
-import com.vaadin.terminal.gwt.client.ui.Action;
-import com.vaadin.terminal.gwt.client.ui.ActionOwner;
-import com.vaadin.terminal.gwt.client.ui.FocusableScrollPanel;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate;
-import com.vaadin.terminal.gwt.client.ui.TreeAction;
-import com.vaadin.terminal.gwt.client.ui.dd.DDUtil;
-import com.vaadin.terminal.gwt.client.ui.dd.VAbstractDropHandler;
-import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCallback;
-import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager;
-import com.vaadin.terminal.gwt.client.ui.dd.VDragEvent;
-import com.vaadin.terminal.gwt.client.ui.dd.VHasDropHandler;
-import com.vaadin.terminal.gwt.client.ui.dd.VTransferable;
-import com.vaadin.terminal.gwt.client.ui.embedded.VEmbedded;
-import com.vaadin.terminal.gwt.client.ui.label.VLabel;
-import com.vaadin.terminal.gwt.client.ui.table.VScrollTable.VScrollTableBody.VScrollTableRow;
-import com.vaadin.terminal.gwt.client.ui.textfield.VTextField;
 
 /**
  * VScrollTable
@@ -5474,7 +5474,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
             /*
              * (non-Javadoc)
              * 
-             * @see com.vaadin.terminal.gwt.client.ui.IActionOwner#getActions ()
+             * @see com.vaadin.client.ui.IActionOwner#getActions ()
              */
 
             @Override
@@ -6794,7 +6794,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.Focusable#focus()
+     * @see com.vaadin.client.Focusable#focus()
      */
 
     @Override
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java b/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
index e8a1c709c4..160ee5e629 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java
+++ b/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.tabsheet;
+package com.vaadin.client.ui.tabsheet;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
 
 public abstract class TabsheetBaseConnector extends
         AbstractComponentContainerConnector implements Paintable {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java b/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java
index 76c56ba2ed..9c30d1037d 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java
+++ b/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.tabsheet;
+package com.vaadin.client.ui.tabsheet;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.DOM;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.TooltipInfo;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.SimpleManagedLayout;
+import com.vaadin.client.ui.layout.MayScrollChildren;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.TooltipInfo;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
-import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
 import com.vaadin.ui.TabSheet;
 
 @Connect(TabSheet.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java b/client/src/com/vaadin/client/ui/tabsheet/VTabsheet.java
index bec36aed4b..ba72f319e1 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/tabsheet/VTabsheet.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.tabsheet;
+package com.vaadin.client.ui.tabsheet;
 
 import java.util.Iterator;
 import java.util.List;
@@ -46,20 +46,20 @@ import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.impl.FocusImpl;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.Focusable;
+import com.vaadin.client.TooltipInfo;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.VCaption;
+import com.vaadin.client.ui.label.VLabel;
 import com.vaadin.shared.ComponentState;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants;
 import com.vaadin.shared.ui.tabsheet.TabsheetConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.TooltipInfo;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.ui.label.VLabel;
 
 public class VTabsheet extends VTabsheetBase implements Focusable,
         FocusHandler, BlurHandler, KeyDownHandler {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetBase.java b/client/src/com/vaadin/client/ui/tabsheet/VTabsheetBase.java
index b9a68dc4af..cde90cdf07 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetBase.java
+++ b/client/src/com/vaadin/client/ui/tabsheet/VTabsheetBase.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.tabsheet;
+package com.vaadin.client.ui.tabsheet;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -23,9 +23,9 @@ import java.util.Set;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.UIDL;
 
 public abstract class VTabsheetBase extends ComplexPanel {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetPanel.java b/client/src/com/vaadin/client/ui/tabsheet/VTabsheetPanel.java
index e48f7ffa1f..6c1b30dc48 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheetPanel.java
+++ b/client/src/com/vaadin/client/ui/tabsheet/VTabsheetPanel.java
@@ -14,19 +14,19 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.tabsheet;
+package com.vaadin.client.ui.tabsheet;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate;
-import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate.TouchScrollHandler;
+import com.vaadin.client.ui.TouchScrollDelegate;
+import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler;
 
 /**
  * A panel that displays all of its child widgets in a 'deck', where only one
  * can be visible at a time. It is used by
- * {@link com.vaadin.terminal.gwt.client.ui.tabsheet.VTabsheet}.
+ * {@link com.vaadin.client.ui.tabsheet.VTabsheet}.
  * 
  * This class has the same basic functionality as the GWT DeckPanel
  * {@link com.google.gwt.user.client.ui.DeckPanel}, with the exception that it
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/textarea/TextAreaConnector.java b/client/src/com/vaadin/client/ui/textarea/TextAreaConnector.java
index d5abed4fa9..bda667e501 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/textarea/TextAreaConnector.java
+++ b/client/src/com/vaadin/client/ui/textarea/TextAreaConnector.java
@@ -14,11 +14,11 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.textarea;
+package com.vaadin.client.ui.textarea;
 
+import com.vaadin.client.ui.textfield.TextFieldConnector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.textarea.TextAreaState;
-import com.vaadin.terminal.gwt.client.ui.textfield.TextFieldConnector;
 import com.vaadin.ui.TextArea;
 
 @Connect(TextArea.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/textarea/VTextArea.java b/client/src/com/vaadin/client/ui/textarea/VTextArea.java
index e1df1ba0db..c4b1c2dd0b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/textarea/VTextArea.java
+++ b/client/src/com/vaadin/client/ui/textarea/VTextArea.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.textarea;
+package com.vaadin.client.ui.textarea;
 
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.dom.client.Style.Overflow;
@@ -26,9 +26,9 @@ import com.google.gwt.event.dom.client.KeyUpHandler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.textfield.VTextField;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.textfield.VTextField;
 
 /**
  * This class represents a multiline textfield (textarea).
@@ -132,7 +132,6 @@ public class VTextArea extends VTextField {
         }
     }
 
-
     @Override
     public int getCursorPos() {
         // This is needed so that TextBoxImplIE6 is used to return the correct
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java b/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java
index d16c01bd27..4216919245 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java
+++ b/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java
@@ -14,20 +14,20 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.textfield;
+package com.vaadin.client.ui.textfield;
 
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Event;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.AbstractFieldConnector;
+import com.vaadin.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.textfield.AbstractTextFieldState;
 import com.vaadin.shared.ui.textfield.TextFieldConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 import com.vaadin.ui.TextField;
 
 @Connect(value = TextField.class, loadStyle = LoadStyle.EAGER)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java b/client/src/com/vaadin/client/ui/textfield/VTextField.java
index 8f07c67c96..4b7e620ab1 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java
+++ b/client/src/com/vaadin/client/ui/textfield/VTextField.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.textfield;
+package com.vaadin.client.ui.textfield;
 
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.BlurHandler;
@@ -30,12 +30,12 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.TextBoxBase;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.Field;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.textfield.TextFieldConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.Field;
 
 /**
  * This class represents a basic text input field with one row.
@@ -44,7 +44,7 @@ import com.vaadin.terminal.gwt.client.ui.Field;
  * 
  */
 public class VTextField extends TextBoxBase implements Field, ChangeHandler,
-FocusHandler, BlurHandler, KeyDownHandler {
+        FocusHandler, BlurHandler, KeyDownHandler {
 
     /**
      * The input node CSS classname.
@@ -114,7 +114,7 @@ FocusHandler, BlurHandler, KeyDownHandler {
 
         if (listenTextChangeEvents
                 && (event.getTypeInt() & TEXTCHANGE_EVENTS) == event
-                .getTypeInt()) {
+                        .getTypeInt()) {
             deferTextChangeEvent();
         }
 
@@ -234,7 +234,7 @@ FocusHandler, BlurHandler, KeyDownHandler {
     /*-{
         var me = this;
         el.oncut = $entry(function() {
-            me.@com.vaadin.terminal.gwt.client.ui.textfield.VTextField::onCut()();
+            me.@com.vaadin.client.ui.textfield.VTextField::onCut()();
         });
     }-*/;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java b/client/src/com/vaadin/client/ui/tree/TreeConnector.java
index a97a4b521f..c7fb8084fa 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java
+++ b/client/src/com/vaadin/client/ui/tree/TreeConnector.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.tree;
+package com.vaadin.client.ui.tree;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
 import com.google.gwt.dom.client.Element;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.TooltipInfo;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.tree.VTree.TreeNode;
 import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.tree.TreeConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.TooltipInfo;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.tree.VTree.TreeNode;
 import com.vaadin.ui.Tree;
 
 @Connect(Tree.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java b/client/src/com/vaadin/client/ui/tree/VTree.java
index 40c5e4b8af..2be3d7b33b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java
+++ b/client/src/com/vaadin/client/ui/tree/VTree.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.tree;
+package com.vaadin.client.ui.tree;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -49,38 +49,38 @@ import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.UIObject;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.MouseEventDetailsBuilder;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.Action;
+import com.vaadin.client.ui.ActionOwner;
+import com.vaadin.client.ui.FocusElementPanel;
+import com.vaadin.client.ui.Icon;
+import com.vaadin.client.ui.SubPartAware;
+import com.vaadin.client.ui.TreeAction;
+import com.vaadin.client.ui.VLazyExecutor;
+import com.vaadin.client.ui.dd.DDUtil;
+import com.vaadin.client.ui.dd.VAbstractDropHandler;
+import com.vaadin.client.ui.dd.VAcceptCallback;
+import com.vaadin.client.ui.dd.VDragAndDropManager;
+import com.vaadin.client.ui.dd.VDragEvent;
+import com.vaadin.client.ui.dd.VDropHandler;
+import com.vaadin.client.ui.dd.VHasDropHandler;
+import com.vaadin.client.ui.dd.VTransferable;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.shared.ui.tree.TreeConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.Action;
-import com.vaadin.terminal.gwt.client.ui.ActionOwner;
-import com.vaadin.terminal.gwt.client.ui.FocusElementPanel;
-import com.vaadin.terminal.gwt.client.ui.Icon;
-import com.vaadin.terminal.gwt.client.ui.SubPartAware;
-import com.vaadin.terminal.gwt.client.ui.TreeAction;
-import com.vaadin.terminal.gwt.client.ui.VLazyExecutor;
-import com.vaadin.terminal.gwt.client.ui.dd.DDUtil;
-import com.vaadin.terminal.gwt.client.ui.dd.VAbstractDropHandler;
-import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCallback;
-import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager;
-import com.vaadin.terminal.gwt.client.ui.dd.VDragEvent;
-import com.vaadin.terminal.gwt.client.ui.dd.VDropHandler;
-import com.vaadin.terminal.gwt.client.ui.dd.VHasDropHandler;
-import com.vaadin.terminal.gwt.client.ui.dd.VTransferable;
 
 /**
  * 
  */
 public class VTree extends FocusElementPanel implements VHasDropHandler,
-FocusHandler, BlurHandler, KeyPressHandler, KeyDownHandler,
-SubPartAware, ActionOwner {
+        FocusHandler, BlurHandler, KeyPressHandler, KeyDownHandler,
+        SubPartAware, ActionOwner {
 
     public static final String CLASSNAME = "v-tree";
 
@@ -137,12 +137,12 @@ SubPartAware, ActionOwner {
     public VLazyExecutor iconLoaded = new VLazyExecutor(50,
             new ScheduledCommand() {
 
-        @Override
-        public void execute() {
-            Util.notifyParentOfSizeChange(VTree.this, true);
-        }
+                @Override
+                public void execute() {
+                    Util.notifyParentOfSizeChange(VTree.this, true);
+                }
 
-    });
+            });
 
     public VTree() {
         super();
@@ -668,7 +668,7 @@ SubPartAware, ActionOwner {
                     && client.hasEventListeners(VTree.this,
                             TreeConstants.ITEM_CLICK_EVENT_ID)
 
-                            && (type == Event.ONDBLCLICK || type == Event.ONMOUSEUP)) {
+                    && (type == Event.ONDBLCLICK || type == Event.ONMOUSEUP)) {
                 fireClick(event);
             }
             if (type == Event.ONCLICK) {
@@ -700,7 +700,7 @@ SubPartAware, ActionOwner {
                             .getEventTarget().cast())) {
                         if (dragMode > 0
                                 && (type == Event.ONTOUCHSTART || event
-                                .getButton() == NativeEvent.BUTTON_LEFT)) {
+                                        .getButton() == NativeEvent.BUTTON_LEFT)) {
                             mouseDownEvent = event; // save event for possible
                             // dd operation
                             if (type == Event.ONMOUSEDOWN) {
@@ -1721,7 +1721,7 @@ SubPartAware, ActionOwner {
                 selectNode(
                         focusedNode,
                         (!isMultiselect || multiSelectMode == MULTISELECT_MODE_SIMPLE)
-                        && selectable);
+                                && selectable);
             } else {
                 deselectNode(focusedNode);
             }
@@ -1967,8 +1967,7 @@ SubPartAware, ActionOwner {
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.gwt.client.ui.SubPartAware#getSubPartElement(java
+     * @see com.vaadin.client.ui.SubPartAware#getSubPartElement(java
      * .lang.String)
      */
     @Override
@@ -2021,8 +2020,7 @@ SubPartAware, ActionOwner {
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.gwt.client.ui.SubPartAware#getSubPartName(com.google
+     * @see com.vaadin.client.ui.SubPartAware#getSubPartName(com.google
      * .gwt.user.client.Element)
      */
     @Override
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java b/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java
index 21f78c2356..5bf1beaf16 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java
+++ b/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.treetable;
+package com.vaadin.client.ui.treetable;
 
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.FocusableScrollPanel;
+import com.vaadin.client.ui.table.TableConnector;
+import com.vaadin.client.ui.table.VScrollTable.VScrollTableBody.VScrollTableRow;
+import com.vaadin.client.ui.treetable.VTreeTable.PendingNavigationEvent;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.treetable.TreeTableConstants;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.FocusableScrollPanel;
-import com.vaadin.terminal.gwt.client.ui.table.TableConnector;
-import com.vaadin.terminal.gwt.client.ui.table.VScrollTable.VScrollTableBody.VScrollTableRow;
-import com.vaadin.terminal.gwt.client.ui.treetable.VTreeTable.PendingNavigationEvent;
 import com.vaadin.ui.TreeTable;
 
 @Connect(TreeTable.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/treetable/VTreeTable.java b/client/src/com/vaadin/client/ui/treetable/VTreeTable.java
index 909acdf85f..807c1f4a42 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/treetable/VTreeTable.java
+++ b/client/src/com/vaadin/client/ui/treetable/VTreeTable.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.treetable;
+package com.vaadin.client.ui.treetable;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -36,11 +36,11 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ComputedStyle;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.table.VScrollTable;
-import com.vaadin.terminal.gwt.client.ui.treetable.VTreeTable.VTreeTableScrollBody.VTreeTableRow;
+import com.vaadin.client.ComputedStyle;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.table.VScrollTable;
+import com.vaadin.client.ui.treetable.VTreeTable.VTreeTableScrollBody.VTreeTableRow;
 
 public class VTreeTable extends VScrollTable {
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java b/client/src/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java
index c4a5437149..745de9fe6c 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java
+++ b/client/src/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.twincolselect;
+package com.vaadin.client.ui.twincolselect;
 
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.DirectionalManagedLayout;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.DirectionalManagedLayout;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.ui.TwinColSelect;
 
 @Connect(TwinColSelect.class)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java b/client/src/com/vaadin/client/ui/twincolselect/VTwinColSelect.java
index fef44eb502..6e5117cec6 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java
+++ b/client/src/com/vaadin/client/ui/twincolselect/VTwinColSelect.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.twincolselect;
+package com.vaadin.client.ui.twincolselect;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -38,12 +38,12 @@ import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Panel;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.SubPartAware;
+import com.vaadin.client.ui.button.VButton;
+import com.vaadin.client.ui.optiongroup.VOptionGroupBase;
 import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.SubPartAware;
-import com.vaadin.terminal.gwt.client.ui.button.VButton;
-import com.vaadin.terminal.gwt.client.ui.optiongroup.VOptionGroupBase;
 
 public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler,
         MouseDownHandler, DoubleClickHandler, SubPartAware {
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java b/client/src/com/vaadin/client/ui/upload/UploadConnector.java
index 83be123eb9..8c23ccfbf7 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java
+++ b/client/src/com/vaadin/client/ui/upload/UploadConnector.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.upload;
+package com.vaadin.client.ui.upload;
 
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 import com.vaadin.ui.Upload;
 
 @Connect(value = Upload.class, loadStyle = LoadStyle.LAZY)
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java
index e81b4909ba..8dfd30ed8e 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java
+++ b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.upload;
+package com.vaadin.client.ui.upload;
 
 public class UploadIFrameOnloadStrategy {
 
@@ -21,7 +21,7 @@ public class UploadIFrameOnloadStrategy {
             VUpload upload)
     /*-{
         iframe.onload = $entry(function() {
-            upload.@com.vaadin.terminal.gwt.client.ui.upload.VUpload::onSubmitComplete()();
+            upload.@com.vaadin.client.ui.upload.VUpload::onSubmitComplete()();
         });
     }-*/;
 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java
index 0f885261e3..9ef1066d22 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java
+++ b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.upload;
+package com.vaadin.client.ui.upload;
 
 import com.google.gwt.dom.client.Element;
 
@@ -27,7 +27,7 @@ public class UploadIFrameOnloadStrategyIE extends UploadIFrameOnloadStrategy {
     /*-{
       iframe.onreadystatechange = $entry(function() {
         if (iframe.readyState == 'complete') {
-          upload.@com.vaadin.terminal.gwt.client.ui.upload.VUpload::onSubmitComplete()();
+          upload.@com.vaadin.client.ui.upload.VUpload::onSubmitComplete()();
         }
       });
     }-*/;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/upload/VUpload.java b/client/src/com/vaadin/client/ui/upload/VUpload.java
index 759236ea7f..42fd285f6b 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/upload/VUpload.java
+++ b/client/src/com/vaadin/client/ui/upload/VUpload.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.upload;
+package com.vaadin.client.ui.upload;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;
@@ -33,10 +33,10 @@ import com.google.gwt.user.client.ui.FormPanel;
 import com.google.gwt.user.client.ui.Hidden;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.SimplePanel;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.ui.button.VButton;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.ui.button.VButton;
 
 /**
  * 
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/video/VVideo.java b/client/src/com/vaadin/client/ui/video/VVideo.java
index 5f8d1ee574..c1f5f1b353 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/video/VVideo.java
+++ b/client/src/com/vaadin/client/ui/video/VVideo.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.video;
+package com.vaadin.client.ui.video;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.dom.client.VideoElement;
 import com.google.gwt.user.client.Element;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.VMediaBase;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.VMediaBase;
 
 public class VVideo extends VMediaBase {
 
@@ -47,7 +47,7 @@ public class VVideo extends VMediaBase {
     /*-{
               var self = this;
               el.addEventListener('loadedmetadata', $entry(function(e) {
-                  self.@com.vaadin.terminal.gwt.client.ui.video.VVideo::updateElementDynamicSize(II)(el.videoWidth, el.videoHeight);
+                  self.@com.vaadin.client.ui.video.VVideo::updateElementDynamicSize(II)(el.videoWidth, el.videoHeight);
               }), false);
 
     }-*/;
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/video/VideoConnector.java b/client/src/com/vaadin/client/ui/video/VideoConnector.java
index 2b228d14ea..d2d9804f66 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/video/VideoConnector.java
+++ b/client/src/com/vaadin/client/ui/video/VideoConnector.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.video;
+package com.vaadin.client.ui.video;
 
-import com.vaadin.shared.communication.URLReference;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.MediaBaseConnector;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.shared.ui.video.VideoConstants;
 import com.vaadin.shared.ui.video.VideoState;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.MediaBaseConnector;
 import com.vaadin.ui.Video;
 
 @Connect(Video.class)
@@ -33,12 +33,7 @@ public class VideoConnector extends MediaBaseConnector {
     @Override
     public void onStateChanged(StateChangeEvent stateChangeEvent) {
         super.onStateChanged(stateChangeEvent);
-        URLReference poster = getState().getPoster();
-        if (poster != null) {
-            getWidget().setPoster(poster.getURL());
-        } else {
-            getWidget().setPoster(null);
-        }
+        getWidget().setPoster(getResourceUrl(VideoConstants.POSTER_RESOURCE));
     }
 
     @Override
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java b/client/src/com/vaadin/client/ui/window/VWindow.java
index 1660eee246..196b28bbd9 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java
+++ b/client/src/com/vaadin/client/ui/window/VWindow.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.ui.window;
+package com.vaadin.client.ui.window;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,21 +38,21 @@ import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorMap;
+import com.vaadin.client.Console;
+import com.vaadin.client.Focusable;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.Util;
+import com.vaadin.client.ui.FocusableScrollPanel;
+import com.vaadin.client.ui.ShortcutActionHandler;
+import com.vaadin.client.ui.VLazyExecutor;
+import com.vaadin.client.ui.VOverlay;
+import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.client.ui.notification.VNotification;
 import com.vaadin.shared.EventId;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorMap;
-import com.vaadin.terminal.gwt.client.Console;
-import com.vaadin.terminal.gwt.client.Focusable;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.ui.FocusableScrollPanel;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
-import com.vaadin.terminal.gwt.client.ui.VLazyExecutor;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
-import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
 
 /**
  * "Sub window" component.
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java b/client/src/com/vaadin/client/ui/window/WindowConnector.java
index 3ee266b944..7c83556283 100644
--- a/client/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java
+++ b/client/src/com/vaadin/client/ui/window/WindowConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.client.ui.window;
+package com.vaadin.client.ui.window;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NativeEvent;
@@ -24,30 +24,30 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.BrowserInfo;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ConnectorHierarchyChangeEvent;
+import com.vaadin.client.LayoutManager;
+import com.vaadin.client.Paintable;
+import com.vaadin.client.UIDL;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.ui.AbstractComponentContainerConnector;
+import com.vaadin.client.ui.ClickEventHandler;
+import com.vaadin.client.ui.PostLayoutListener;
+import com.vaadin.client.ui.ShortcutActionHandler;
+import com.vaadin.client.ui.SimpleManagedLayout;
+import com.vaadin.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
+import com.vaadin.client.ui.layout.MayScrollChildren;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.window.WindowServerRpc;
 import com.vaadin.shared.ui.window.WindowState;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.LayoutManager;
-import com.vaadin.terminal.gwt.client.Paintable;
-import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
-import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
-import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
-import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
 
 @Connect(value = com.vaadin.ui.Window.class)
 public class WindowConnector extends AbstractComponentContainerConnector
-implements Paintable, BeforeShortcutActionListener,
-SimpleManagedLayout, PostLayoutListener, MayScrollChildren {
+        implements Paintable, BeforeShortcutActionListener,
+        SimpleManagedLayout, PostLayoutListener, MayScrollChildren {
 
     private ClickEventHandler clickEventHandler = new ClickEventHandler(this) {
         @Override
@@ -115,8 +115,8 @@ SimpleManagedLayout, PostLayoutListener, MayScrollChildren {
             // Caption must be set before required header size is measured. If
             // the caption attribute is missing the caption should be cleared.
             String iconURL = null;
-            if (getState().getIcon() != null) {
-                iconURL = getState().getIcon().getURL();
+            if (getIcon() != null) {
+                iconURL = getIcon();
             }
             getWidget().setCaption(getState().getCaption(), iconURL);
         }
diff --git a/client/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml b/client/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml
new file mode 100644
index 0000000000..c127d3bb21
--- /dev/null
+++ b/client/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml
@@ -0,0 +1,6 @@
+<module>
+	<!-- WS Compiler: manually edited  -->
+
+	<!-- Inherit the DefaultWidgetSet -->
+	<inherits name="com.vaadin.DefaultWidgetSet" />
+</module>
diff --git a/client/src/com/vaadin/terminal/gwt/VaadinBrowserSpecificOverrides.gwt.xml b/client/src/com/vaadin/terminal/gwt/VaadinBrowserSpecificOverrides.gwt.xml
deleted file mode 100644
index 04d2c18060..0000000000
--- a/client/src/com/vaadin/terminal/gwt/VaadinBrowserSpecificOverrides.gwt.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<module>
-	<!-- This GWT module defines the browser specific overrides used by Vaadin -->
-
-	<!-- Hint for WidgetSetBuilder not to automatically update the file -->
-	<!-- WS Compiler: manually edited -->
-
-	<!-- Fall through to this rule for everything but IE -->
-	<replace-with
-		class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategy">
-		<when-type-is
-			class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategy" />
-	</replace-with>
-
-	<replace-with
-		class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategyIE">
-		<when-type-is
-			class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategy" />
-		<any>
-			<when-property-is name="user.agent" value="ie8" />
-		</any>
-	</replace-with>
-
-	<!-- Fall through to this rule for everything but IE -->
-	<replace-with class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper">
-		<when-type-is class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper" />
-	</replace-with>
-
-	<replace-with class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapperIE">
-		<when-type-is class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper" />
-		<any>
-			<when-property-is name="user.agent" value="ie8" />
-		</any>
-	</replace-with>
-
-	<!-- Fall through to this rule for everything but IE -->
-	<replace-with class="com.vaadin.terminal.gwt.client.LayoutManager">
-		<when-type-is class="com.vaadin.terminal.gwt.client.LayoutManager" />
-	</replace-with>
-
-	<replace-with class="com.vaadin.terminal.gwt.client.LayoutManagerIE8">
-		<when-type-is class="com.vaadin.terminal.gwt.client.LayoutManager" />
-		<any>
-			<when-property-is name="user.agent" value="ie8" />
-		</any>
-	</replace-with>
-
-</module>
diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java b/client/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java
deleted file mode 100644
index 9b03c03794..0000000000
--- a/client/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/* 
- * Copyright 2011 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.terminal.gwt.client.ui;
-
-import com.google.gwt.user.client.ui.AbstractImagePrototype;
-
-public interface TreeImages extends com.google.gwt.user.client.ui.TreeImages {
-
-    /**
-     * An image indicating an open branch.
-     * 
-     * @return a prototype of this image
-     * @gwt.resource com/vaadin/terminal/gwt/public/default/tree/img/expanded
-     *               .png
-     */
-    @Override
-    AbstractImagePrototype treeOpen();
-
-    /**
-     * An image indicating a closed branch.
-     * 
-     * @return a prototype of this image
-     * @gwt.resource com/vaadin/terminal/gwt/public/default/tree/img/collapsed
-     *               .png
-     */
-    @Override
-    AbstractImagePrototype treeClosed();
-
-}
diff --git a/client/src/com/vaadin/terminal/gwt/public/ie6pngfix/blank.gif b/client/src/com/vaadin/terminal/gwt/public/ie6pngfix/blank.gif
deleted file mode 100644
index 3776af0784..0000000000
--- a/client/src/com/vaadin/terminal/gwt/public/ie6pngfix/blank.gif
+++ /dev/null
diff --git a/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java b/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
new file mode 100644
index 0000000000..da5970d64d
--- /dev/null
+++ b/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
@@ -0,0 +1,77 @@
+package com.vaadin.client;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.vaadin.client.ApplicationConnection;
+
+public class ApplicationConnectionTestURLGeneration {
+
+    private static final String[] URIS = new String[] {
+            "http://demo.vaadin.com/", //
+            "https://demo.vaadin.com/",
+            "http://demo.vaadin.com/foo",
+            "http://demo.vaadin.com/foo?f",
+            "http://demo.vaadin.com/foo?f=1",
+            "http://demo.vaadin.com:1234/foo?a",
+            "http://demo.vaadin.com:1234/foo#frag?fakeparam",
+            // Jetspeed
+            "http://localhost:8080/jetspeed/portal/_ns:Z3RlbXBsYXRlLXRvcDJfX3BhZ2UtdGVtcGxhdGVfX2RwLTFfX1AtMTJjNTRkYjdlYjUtMTAwMDJ8YzB8ZDF8aVVJREx8Zg__",
+            // Liferay generated url
+            "http://vaadin.com/directory?p_p_id=Directory_WAR_Directory&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view&p_p_resource_id=UIDL&p_p_cacheability=cacheLevelPage&p_p_col_id=row-1&p_p_col_count=1",
+
+    };
+    private static final String[] URIS_WITH_ABCD_PARAM = new String[] {
+            "http://demo.vaadin.com/?a=b&c=d",
+            "https://demo.vaadin.com/?a=b&c=d",
+            "http://demo.vaadin.com/foo?a=b&c=d",
+            "http://demo.vaadin.com/foo?f&a=b&c=d",
+            "http://demo.vaadin.com/foo?f=1&a=b&c=d",
+            "http://demo.vaadin.com:1234/foo?a&a=b&c=d",
+            "http://demo.vaadin.com:1234/foo?a=b&c=d#frag?fakeparam",
+            "http://localhost:8080/jetspeed/portal/_ns:Z3RlbXBsYXRlLXRvcDJfX3BhZ2UtdGVtcGxhdGVfX2RwLTFfX1AtMTJjNTRkYjdlYjUtMTAwMDJ8YzB8ZDF8aVVJREx8Zg__?a=b&c=d",
+            "http://vaadin.com/directory?p_p_id=Directory_WAR_Directory&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view&p_p_resource_id=UIDL&p_p_cacheability=cacheLevelPage&p_p_col_id=row-1&p_p_col_count=1&a=b&c=d",
+
+    };
+
+    private static final String[] URIS_WITH_ABCD_PARAM_AND_FRAGMENT = new String[] {
+            "http://demo.vaadin.com/?a=b&c=d#fragment",
+            "https://demo.vaadin.com/?a=b&c=d#fragment",
+            "http://demo.vaadin.com/foo?a=b&c=d#fragment",
+            "http://demo.vaadin.com/foo?f&a=b&c=d#fragment",
+            "http://demo.vaadin.com/foo?f=1&a=b&c=d#fragment",
+            "http://demo.vaadin.com:1234/foo?a&a=b&c=d#fragment",
+            "",
+            "http://localhost:8080/jetspeed/portal/_ns:Z3RlbXBsYXRlLXRvcDJfX3BhZ2UtdGVtcGxhdGVfX2RwLTFfX1AtMTJjNTRkYjdlYjUtMTAwMDJ8YzB8ZDF8aVVJREx8Zg__?a=b&c=d#fragment",
+            "http://vaadin.com/directory?p_p_id=Directory_WAR_Directory&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view&p_p_resource_id=UIDL&p_p_cacheability=cacheLevelPage&p_p_col_id=row-1&p_p_col_count=1&a=b&c=d#fragment",
+
+    };
+
+    @Test
+    public void testParameterAdding() {
+        for (int i = 0; i < URIS.length; i++) {
+            // Adding nothing
+            assertEquals(URIS[i],
+                    ApplicationConnection.addGetParameters(URIS[i], ""));
+
+            // Adding a=b&c=d
+            assertEquals(URIS_WITH_ABCD_PARAM[i],
+                    ApplicationConnection.addGetParameters(URIS[i], "a=b&c=d"));
+
+            // Fragments
+            if (URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i].length() > 0) {
+                assertEquals(
+                        URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i],
+                        ApplicationConnection.addGetParameters(URIS[i]
+                                + "#fragment", "a=b&c=d"));
+
+                // Empty fragment
+                assertEquals(URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i].replace(
+                        "#fragment", "#"),
+                        ApplicationConnection.addGetParameters(URIS[i] + "#",
+                                "a=b&c=d"));
+            }
+        }
+    }
+}
diff --git a/client/tests/src/com/vaadin/client/DateTimeServiceTest.java b/client/tests/src/com/vaadin/client/DateTimeServiceTest.java
new file mode 100755
index 0000000000..6852e9ec3f
--- /dev/null
+++ b/client/tests/src/com/vaadin/client/DateTimeServiceTest.java
@@ -0,0 +1,111 @@
+package com.vaadin.client;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import com.vaadin.client.DateTimeService;
+
+public class DateTimeServiceTest extends TestCase {
+
+    final long MILLISECONDS_PER_DAY = 24 * 3600 * 1000;
+
+    static Map<Date, Integer> isoWeekNumbers = new HashMap<Date, Integer>();
+    static {
+        isoWeekNumbers.put(getDate(2005, 02, 02), 5);
+
+        isoWeekNumbers.put(getDate(2005, 1, 1), 53);
+        isoWeekNumbers.put(getDate(2005, 1, 2), 53);
+        isoWeekNumbers.put(getDate(2005, 1, 3), 1);
+        isoWeekNumbers.put(getDate(2005, 1, 4), 1);
+        isoWeekNumbers.put(getDate(2005, 1, 5), 1);
+        isoWeekNumbers.put(getDate(2005, 1, 6), 1);
+        isoWeekNumbers.put(getDate(2005, 1, 7), 1);
+        isoWeekNumbers.put(getDate(2005, 1, 8), 1);
+        isoWeekNumbers.put(getDate(2005, 1, 9), 1);
+        isoWeekNumbers.put(getDate(2005, 1, 10), 2);
+        isoWeekNumbers.put(getDate(2005, 12, 31), 52);
+        isoWeekNumbers.put(getDate(2005, 12, 30), 52);
+        isoWeekNumbers.put(getDate(2005, 12, 29), 52);
+        isoWeekNumbers.put(getDate(2005, 12, 28), 52);
+        isoWeekNumbers.put(getDate(2005, 12, 27), 52);
+        isoWeekNumbers.put(getDate(2005, 12, 26), 52);
+        isoWeekNumbers.put(getDate(2005, 12, 25), 51);
+        isoWeekNumbers.put(getDate(2007, 1, 1), 1);
+        isoWeekNumbers.put(getDate(2007, 12, 30), 52);
+        isoWeekNumbers.put(getDate(2007, 12, 31), 1);
+        isoWeekNumbers.put(getDate(2008, 1, 1), 1);
+        isoWeekNumbers.put(getDate(2008, 12, 28), 52);
+        isoWeekNumbers.put(getDate(2008, 12, 29), 1);
+        isoWeekNumbers.put(getDate(2008, 12, 30), 1);
+        isoWeekNumbers.put(getDate(2008, 12, 31), 1);
+        isoWeekNumbers.put(getDate(2009, 1, 1), 1);
+        isoWeekNumbers.put(getDate(2009, 12, 31), 53);
+        isoWeekNumbers.put(getDate(2010, 1, 1), 53);
+        isoWeekNumbers.put(getDate(2010, 1, 2), 53);
+        isoWeekNumbers.put(getDate(2010, 1, 3), 53);
+        isoWeekNumbers.put(getDate(2010, 1, 4), 1);
+        isoWeekNumbers.put(getDate(2010, 1, 5), 1);
+        isoWeekNumbers.put(getDate(2010, 10, 10), 40);
+
+    }
+
+    /**
+     * Test all dates from 1990-1992 + some more and see that {@link Calendar}
+     * calculates the ISO week number like we do.
+     * 
+     */
+    public void testISOWeekNumbers() {
+        Calendar c = Calendar.getInstance();
+        c.set(1990, 1, 1);
+        long start = c.getTimeInMillis();
+
+        for (int i = 0; i < 1000; i++) {
+            Date d = new Date(start + i * MILLISECONDS_PER_DAY);
+            int expected = getCalendarISOWeekNr(d);
+            int calculated = DateTimeService.getISOWeekNumber(d);
+            assertEquals(d + " should be week " + expected, expected,
+                    calculated);
+
+        }
+    }
+
+    /**
+     * Verify that special cases are handled correctly by us (and
+     * {@link Calendar}).
+     * 
+     */
+    public void testSampleISOWeekNumbers() {
+        for (Date d : isoWeekNumbers.keySet()) {
+            // System.out.println("Sample: " + d);
+            int expected = isoWeekNumbers.get(d);
+            int calculated = DateTimeService.getISOWeekNumber(d);
+            assertEquals(d + " should be week " + expected
+                    + " (Java Calendar is wrong?)", expected,
+                    getCalendarISOWeekNr(d));
+            assertEquals(d + " should be week " + expected, expected,
+                    calculated);
+
+        }
+    }
+
+    private int getCalendarISOWeekNr(Date d) {
+        Calendar c = Calendar.getInstance();
+        c.setFirstDayOfWeek(Calendar.MONDAY);
+        c.setMinimalDaysInFirstWeek(4);
+        c.setTime(d);
+
+        return c.get(Calendar.WEEK_OF_YEAR);
+    }
+
+    private static Date getDate(int year, int month, int date) {
+        Calendar c = Calendar.getInstance();
+        c.clear();
+        c.set(year, month - 1, date);
+        return c.getTime();
+    }
+
+}
diff --git a/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java b/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
new file mode 100644
index 0000000000..04e8be699b
--- /dev/null
+++ b/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
@@ -0,0 +1,487 @@
+package com.vaadin.client;
+
+import com.vaadin.shared.VBrowserDetails;
+
+import junit.framework.TestCase;
+
+public class TestVBrowserDetailsUserAgentParser extends TestCase {
+
+    private static final String FIREFOX30_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6";
+    private static final String FIREFOX30_LINUX = "Mozilla/5.0 (X11; U; Linux x86_64; es-ES; rv:1.9.0.12) Gecko/2009070811 Ubuntu/9.04 (jaunty) Firefox/3.0.12";
+    private static final String FIREFOX35_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.8) Gecko/20100202 Firefox/3.5.8 (.NET CLR 3.5.30729) FirePHP/0.4";
+    private static final String FIREFOX36_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6 (.NET CLR 3.5.30729)";
+    private static final String FIREFOX36B_MAC = "UAString mozilla/5.0 (macintosh; u; intel mac os x 10.6; en-us; rv:1.9.2) gecko/20100115 firefox/3.6";
+    private static final String FIREFOX_30B5_MAC = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.4; en-US; rv:1.9b5) Gecko/2008032619 Firefox/3.0b5";
+    private static final String FIREFOX_40B7_WIN = "Mozilla/5.0 (Windows NT 5.1; rv:2.0b7) Gecko/20100101 Firefox/4.0b7";
+    private static final String FIREFOX_40B11_WIN = "Mozilla/5.0 (Windows NT 5.1; rv:2.0b11) Gecko/20100101 Firefox/4.0b11";
+    private static final String KONQUEROR_LINUX = "Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.5 (like Gecko) (Exabot-Thumbnails)";
+
+    private static final String IE6_WINDOWS = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 2.0.50727)";
+    private static final String IE7_WINDOWS = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)";
+
+    private static final String IE8_WINDOWS = "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; InfoPath.2)";
+    private static final String IE8_IN_IE7_MODE_WINDOWS = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; InfoPath.2)";
+
+    private static final String IE9_BETA_IN_IE7_MODE_WINDOWS_7 = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C)";
+    private static final String IE9_BETA_IN_IE8_MODE_WINDOWS_7 = "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C)";
+    private static final String IE9_BETA_WINDOWS_7 = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)";
+
+    // "Version/" was added in 10.00
+    private static final String OPERA964_WINDOWS = "Opera/9.64(Windows NT 5.1; U; en) Presto/2.1.1";
+    private static final String OPERA1010_WINDOWS = "Opera/9.80 (Windows NT 5.1; U; en) Presto/2.2.15 Version/10.10";
+    private static final String OPERA1050_WINDOWS = "Opera/9.80 (Windows NT 5.1; U; en) Presto/2.5.22 Version/10.50";
+
+    private static final String CHROME3_MAC = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-US) AppleWebKit/532.0 (KHTML, like Gecko) Chrome/3.0.198 Safari/532.0";
+    private static final String CHROME4_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/532.5 (KHTML, like Gecko) Chrome/4.0.249.89 Safari/532.5";
+
+    private static final String SAFARI3_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 5.1; cs-CZ) AppleWebKit/525.28.3 (KHTML, like Gecko) Version/3.2.3 Safari/525.29";
+    private static final String SAFARI4_MAC = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_5_8; en-us) AppleWebKit/531.22.7 (KHTML, like Gecko) Version/4.0.5 Safari/531.22.7";
+
+    private static final String IPHONE_IOS_5_1 = "Mozilla/5.0 (iPhone; CPU iPhone OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B179 Safari/7534.48.3";
+    private static final String IPHONE_IOS_4_0 = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
+    private static final String IPAD_IOS_4_3_1 = "Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5";
+
+    private static final String ANDROID_HTC_2_1 = "Mozilla/5.0 (Linux; U; Android 2.1-update1; en-us; ADR6300 Build/ERE27) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17";
+    private static final String ANDROID_GOOGLE_NEXUS_2_2 = "Mozilla/5.0 (Linux; U; Android 2.2; en-us; Nexus One Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1";
+    private static final String ANDROID_MOTOROLA_3_0 = "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13";
+    private static final String ANDROID_GALAXY_NEXUS_4_0_4_CHROME = "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19";
+
+    public void testSafari3() {
+        VBrowserDetails bd = new VBrowserDetails(SAFARI3_WINDOWS);
+        assertWebKit(bd);
+        assertSafari(bd);
+        assertBrowserMajorVersion(bd, 3);
+        assertBrowserMinorVersion(bd, 2);
+        assertEngineVersion(bd, 525.0f);
+        assertWindows(bd);
+    }
+
+    public void testSafari4() {
+        VBrowserDetails bd = new VBrowserDetails(SAFARI4_MAC);
+        assertWebKit(bd);
+        assertSafari(bd);
+        assertBrowserMajorVersion(bd, 4);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 531f);
+        assertMacOSX(bd);
+    }
+
+    public void testIPhoneIOS5() {
+        VBrowserDetails bd = new VBrowserDetails(IPHONE_IOS_5_1);
+        assertWebKit(bd);
+        assertSafari(bd);
+        assertBrowserMajorVersion(bd, 5);
+        assertBrowserMinorVersion(bd, 1);
+        assertEngineVersion(bd, 534f);
+        assertIOS(bd, 5, 1);
+    }
+
+    public void testIPhoneIOS4() {
+        VBrowserDetails bd = new VBrowserDetails(IPHONE_IOS_4_0);
+        assertWebKit(bd);
+        assertSafari(bd);
+        assertBrowserMajorVersion(bd, 4);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 532f);
+        assertIOS(bd, 4, 0);
+    }
+
+    public void testIPadIOS4() {
+        VBrowserDetails bd = new VBrowserDetails(IPAD_IOS_4_3_1);
+        assertWebKit(bd);
+        assertSafari(bd);
+        assertBrowserMajorVersion(bd, 5);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 533f);
+        assertIOS(bd, 4, 3);
+    }
+
+    public void testAndroid21() {
+        VBrowserDetails bd = new VBrowserDetails(ANDROID_HTC_2_1);
+        assertWebKit(bd);
+        assertSafari(bd);
+        assertBrowserMajorVersion(bd, 4);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 530f);
+        assertAndroid(bd, 2, 1);
+
+    }
+
+    public void testAndroid22() {
+        VBrowserDetails bd = new VBrowserDetails(ANDROID_GOOGLE_NEXUS_2_2);
+        assertWebKit(bd);
+        assertSafari(bd);
+        assertBrowserMajorVersion(bd, 4);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 533f);
+        assertAndroid(bd, 2, 2);
+    }
+
+    public void testAndroid30() {
+        VBrowserDetails bd = new VBrowserDetails(ANDROID_MOTOROLA_3_0);
+        assertWebKit(bd);
+        assertSafari(bd);
+        assertBrowserMajorVersion(bd, 4);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 534f);
+        assertAndroid(bd, 3, 0);
+    }
+
+    public void testAndroid40Chrome() {
+        VBrowserDetails bd = new VBrowserDetails(
+                ANDROID_GALAXY_NEXUS_4_0_4_CHROME);
+        assertWebKit(bd);
+        assertChrome(bd);
+        assertBrowserMajorVersion(bd, 18);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 535f);
+        assertAndroid(bd, 4, 0);
+    }
+
+    private void assertOSMajorVersion(VBrowserDetails bd, int i) {
+        assertEquals(i, bd.getOperatingSystemMajorVersion());
+    }
+
+    private void assertOSMinorVersion(VBrowserDetails bd, int i) {
+        assertEquals(i, bd.getOperatingSystemMinorVersion());
+    }
+
+    public void testChrome3() {
+        VBrowserDetails bd = new VBrowserDetails(CHROME3_MAC);
+        assertWebKit(bd);
+        assertChrome(bd);
+        assertBrowserMajorVersion(bd, 3);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 532.0f);
+        assertMacOSX(bd);
+    }
+
+    public void testChrome4() {
+        VBrowserDetails bd = new VBrowserDetails(CHROME4_WINDOWS);
+        assertWebKit(bd);
+        assertChrome(bd);
+        assertBrowserMajorVersion(bd, 4);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 532f);
+        assertWindows(bd);
+    }
+
+    public void testFirefox3() {
+        VBrowserDetails bd = new VBrowserDetails(FIREFOX30_WINDOWS);
+        assertGecko(bd);
+        assertFirefox(bd);
+        assertBrowserMajorVersion(bd, 3);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 1.9f);
+        assertWindows(bd);
+
+        bd = new VBrowserDetails(FIREFOX30_LINUX);
+        assertGecko(bd);
+        assertFirefox(bd);
+        assertBrowserMajorVersion(bd, 3);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 1.9f);
+        assertLinux(bd);
+    }
+
+    public void testFirefox35() {
+        VBrowserDetails bd = new VBrowserDetails(FIREFOX35_WINDOWS);
+        assertGecko(bd);
+        assertFirefox(bd);
+        assertBrowserMajorVersion(bd, 3);
+        assertBrowserMinorVersion(bd, 5);
+        assertEngineVersion(bd, 1.9f);
+        assertWindows(bd);
+    }
+
+    public void testFirefox36() {
+        VBrowserDetails bd = new VBrowserDetails(FIREFOX36_WINDOWS);
+        assertGecko(bd);
+        assertFirefox(bd);
+        assertBrowserMajorVersion(bd, 3);
+        assertBrowserMinorVersion(bd, 6);
+        assertEngineVersion(bd, 1.9f);
+        assertWindows(bd);
+    }
+
+    public void testFirefox30b5() {
+        VBrowserDetails bd = new VBrowserDetails(FIREFOX_30B5_MAC);
+        assertGecko(bd);
+        assertFirefox(bd);
+        assertBrowserMajorVersion(bd, 3);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 1.9f);
+        assertMacOSX(bd);
+    }
+
+    public void testFirefox40b11() {
+        VBrowserDetails bd = new VBrowserDetails(FIREFOX_40B11_WIN);
+        assertGecko(bd);
+        assertFirefox(bd);
+        assertBrowserMajorVersion(bd, 4);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 2.0f);
+        assertWindows(bd);
+    }
+
+    public void testFirefox40b7() {
+        VBrowserDetails bd = new VBrowserDetails(FIREFOX_40B7_WIN);
+        assertGecko(bd);
+        assertFirefox(bd);
+        assertBrowserMajorVersion(bd, 4);
+        assertBrowserMinorVersion(bd, 0);
+        assertEngineVersion(bd, 2.0f);
+        assertWindows(bd);
+    }
+
+    public void testKonquerorLinux() {
+        // Just ensure detection does not crash
+        VBrowserDetails bd = new VBrowserDetails(KONQUEROR_LINUX);
+        assertLinux(bd);
+    }
+
+    public void testFirefox36b() {
+        VBrowserDetails bd = new VBrowserDetails(FIREFOX36B_MAC);
+        assertGecko(bd);
+        assertFirefox(bd);
+        assertBrowserMajorVersion(bd, 3);
+        assertBrowserMinorVersion(bd, 6);
+        assertEngineVersion(bd, 1.9f);
+        assertMacOSX(bd);
+    }
+
+    public void testOpera964() {
+        VBrowserDetails bd = new VBrowserDetails(OPERA964_WINDOWS);
+        assertPresto(bd);
+        assertOpera(bd);
+        assertBrowserMajorVersion(bd, 9);
+        assertBrowserMinorVersion(bd, 64);
+        assertWindows(bd);
+    }
+
+    public void testOpera1010() {
+        VBrowserDetails bd = new VBrowserDetails(OPERA1010_WINDOWS);
+        assertPresto(bd);
+        assertOpera(bd);
+        assertBrowserMajorVersion(bd, 10);
+        assertBrowserMinorVersion(bd, 10);
+        assertWindows(bd);
+    }
+
+    public void testOpera1050() {
+        VBrowserDetails bd = new VBrowserDetails(OPERA1050_WINDOWS);
+        assertPresto(bd);
+        assertOpera(bd);
+        assertBrowserMajorVersion(bd, 10);
+        assertBrowserMinorVersion(bd, 50);
+        assertWindows(bd);
+    }
+
+    public void testIE6() {
+        VBrowserDetails bd = new VBrowserDetails(IE6_WINDOWS);
+        // assertTrident(bd);
+        assertIE(bd);
+        assertBrowserMajorVersion(bd, 6);
+        assertBrowserMinorVersion(bd, 0);
+        assertWindows(bd);
+    }
+
+    public void testIE7() {
+        VBrowserDetails bd = new VBrowserDetails(IE7_WINDOWS);
+        // assertTrident(bd);
+        assertIE(bd);
+        assertBrowserMajorVersion(bd, 7);
+        assertBrowserMinorVersion(bd, 0);
+        assertWindows(bd);
+    }
+
+    public void testIE8() {
+        VBrowserDetails bd = new VBrowserDetails(IE8_WINDOWS);
+        // assertTrident(bd);
+        assertIE(bd);
+        assertBrowserMajorVersion(bd, 8);
+        assertBrowserMinorVersion(bd, 0);
+        assertWindows(bd);
+    }
+
+    public void testIE8CompatibilityMode() {
+        VBrowserDetails bd = new VBrowserDetails(IE8_IN_IE7_MODE_WINDOWS);
+        bd.setIEMode(7);
+
+        // assertTrident(bd);
+        assertIE(bd);
+        assertBrowserMajorVersion(bd, 7);
+        assertBrowserMinorVersion(bd, 0);
+
+        assertWindows(bd);
+    }
+
+    public void testIE9() {
+        VBrowserDetails bd = new VBrowserDetails(IE9_BETA_WINDOWS_7);
+        // assertTrident(bd);
+        assertIE(bd);
+        assertBrowserMajorVersion(bd, 9);
+        assertBrowserMinorVersion(bd, 0);
+        assertWindows(bd);
+    }
+
+    public void testIE9InIE7CompatibilityMode() {
+        VBrowserDetails bd = new VBrowserDetails(IE9_BETA_IN_IE7_MODE_WINDOWS_7);
+        // bd.setIE8InCompatibilityMode();
+
+        // assertTrident(bd);
+        assertIE(bd);
+        assertBrowserMajorVersion(bd, 7);
+        assertBrowserMinorVersion(bd, 0);
+
+        assertWindows(bd);
+    }
+
+    public void testIE9InIE8CompatibilityMode() {
+        VBrowserDetails bd = new VBrowserDetails(IE9_BETA_IN_IE8_MODE_WINDOWS_7);
+        // bd.setIE8InCompatibilityMode();
+
+        // assertTrident(bd);
+        assertIE(bd);
+        assertBrowserMajorVersion(bd, 8);
+        assertBrowserMinorVersion(bd, 0);
+
+        assertWindows(bd);
+    }
+
+    /*
+     * Helper methods below
+     */
+
+    private void assertEngineVersion(VBrowserDetails browserDetails,
+            float version) {
+        assertEquals(version, browserDetails.getBrowserEngineVersion());
+
+    }
+
+    private void assertBrowserMajorVersion(VBrowserDetails browserDetails,
+            int version) {
+        assertEquals(version, browserDetails.getBrowserMajorVersion());
+
+    }
+
+    private void assertBrowserMinorVersion(VBrowserDetails browserDetails,
+            int version) {
+        assertEquals(version, browserDetails.getBrowserMinorVersion());
+
+    }
+
+    private void assertGecko(VBrowserDetails browserDetails) {
+        // Engine
+        assertTrue(browserDetails.isGecko());
+        assertFalse(browserDetails.isWebKit());
+        assertFalse(browserDetails.isPresto());
+    }
+
+    private void assertPresto(VBrowserDetails browserDetails) {
+        // Engine
+        assertFalse(browserDetails.isGecko());
+        assertFalse(browserDetails.isWebKit());
+        assertTrue(browserDetails.isPresto());
+    }
+
+    private void assertWebKit(VBrowserDetails browserDetails) {
+        // Engine
+        assertFalse(browserDetails.isGecko());
+        assertTrue(browserDetails.isWebKit());
+        assertFalse(browserDetails.isPresto());
+    }
+
+    private void assertFirefox(VBrowserDetails browserDetails) {
+        // Browser
+        assertTrue(browserDetails.isFirefox());
+        assertFalse(browserDetails.isChrome());
+        assertFalse(browserDetails.isIE());
+        assertFalse(browserDetails.isOpera());
+        assertFalse(browserDetails.isSafari());
+    }
+
+    private void assertChrome(VBrowserDetails browserDetails) {
+        // Browser
+        assertFalse(browserDetails.isFirefox());
+        assertTrue(browserDetails.isChrome());
+        assertFalse(browserDetails.isIE());
+        assertFalse(browserDetails.isOpera());
+        assertFalse(browserDetails.isSafari());
+    }
+
+    private void assertIE(VBrowserDetails browserDetails) {
+        // Browser
+        assertFalse(browserDetails.isFirefox());
+        assertFalse(browserDetails.isChrome());
+        assertTrue(browserDetails.isIE());
+        assertFalse(browserDetails.isOpera());
+        assertFalse(browserDetails.isSafari());
+    }
+
+    private void assertOpera(VBrowserDetails browserDetails) {
+        // Browser
+        assertFalse(browserDetails.isFirefox());
+        assertFalse(browserDetails.isChrome());
+        assertFalse(browserDetails.isIE());
+        assertTrue(browserDetails.isOpera());
+        assertFalse(browserDetails.isSafari());
+    }
+
+    private void assertSafari(VBrowserDetails browserDetails) {
+        // Browser
+        assertFalse(browserDetails.isFirefox());
+        assertFalse(browserDetails.isChrome());
+        assertFalse(browserDetails.isIE());
+        assertFalse(browserDetails.isOpera());
+        assertTrue(browserDetails.isSafari());
+    }
+
+    private void assertMacOSX(VBrowserDetails browserDetails) {
+        assertFalse(browserDetails.isLinux());
+        assertFalse(browserDetails.isWindows());
+        assertTrue(browserDetails.isMacOSX());
+        assertFalse(browserDetails.isAndroid());
+    }
+
+    private void assertAndroid(VBrowserDetails browserDetails,
+            int majorVersion, int minorVersion) {
+        assertFalse(browserDetails.isLinux());
+        assertFalse(browserDetails.isWindows());
+        assertFalse(browserDetails.isMacOSX());
+        assertFalse(browserDetails.isIOS());
+        assertTrue(browserDetails.isAndroid());
+
+        assertOSMajorVersion(browserDetails, majorVersion);
+        assertOSMinorVersion(browserDetails, minorVersion);
+    }
+
+    private void assertIOS(VBrowserDetails browserDetails, int majorVersion,
+            int minorVersion) {
+        assertFalse(browserDetails.isLinux());
+        assertFalse(browserDetails.isWindows());
+        assertFalse(browserDetails.isMacOSX());
+        assertTrue(browserDetails.isIOS());
+        assertFalse(browserDetails.isAndroid());
+
+        assertOSMajorVersion(browserDetails, majorVersion);
+        assertOSMinorVersion(browserDetails, minorVersion);
+    }
+
+    private void assertWindows(VBrowserDetails browserDetails) {
+        assertFalse(browserDetails.isLinux());
+        assertTrue(browserDetails.isWindows());
+        assertFalse(browserDetails.isMacOSX());
+        assertFalse(browserDetails.isIOS());
+        assertFalse(browserDetails.isAndroid());
+    }
+
+    private void assertLinux(VBrowserDetails browserDetails) {
+        assertTrue(browserDetails.isLinux());
+        assertFalse(browserDetails.isWindows());
+        assertFalse(browserDetails.isMacOSX());
+        assertFalse(browserDetails.isIOS());
+        assertFalse(browserDetails.isAndroid());
+    }
+
+}