Renamed com.vaadin.terminal.gwt.client to com.vaadin.client (#9432)

build/build.xml

                 <exclude name="VAADIN/themes/liferay/**/*" />
                 <exclude name="VAADIN/themes/reindeer/**/*" />
                 <exclude name="VAADIN/themes/runo/**/*" />
-                <exclude name="VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" />
+                <exclude name="VAADIN/widgetsets/com.vaadin.DefaultWidgetSet/**/*" />
                 -->
 
                 <!-- Not needed for testing -->
     <target name="compile-widgetset-default">
         <antcall target="compile-widgetset">
             <reference refid="compile.classpath.widgetset" />
-            <param name="widgetset" value="com.vaadin.terminal.gwt.DefaultWidgetSet"/>
+            <param name="widgetset" value="com.vaadin.DefaultWidgetSet"/>
         </antcall>
     </target>
     
             <metainf dir="${output-dir}/META-INF"/>
             <manifest>
                 <attribute name="Vaadin-Package-Version" value="1" />
-                <attribute name="Vaadin-Widgetsets" value="com.vaadin.terminal.gwt.DefaultWidgetSet" />
+                <attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" />
                 <attribute name="Implementation-Vendor" value="Vaadin Ltd" />
                 <attribute name="Implementation-URL" value="http://vaadin.com" />
                 <attribute name="Implementation-Version" value="${version.full}" />
         	<fileset dir="${result-classes-gwt}"/>
             <fileset dir="${output-dir}/WebContent">
                 <patternset>
-                    <include name="VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" />
+                    <include name="VAADIN/widgetsets/com.vaadin.DefaultWidgetSet/**/*" />
                     <include name="VAADIN/themes/base/**/*" />
                     <include name="VAADIN/themes/chameleon/**/*" />
                     <include name="VAADIN/themes/liferay/**/*" />
             </fileset>
         	
         	<!-- Precompiled widgetset (.gwtar file) not included to limit JAR size -->
-            <!-- <fileset dir="${result-precompiled-widgetsets}" includes="com/vaadin/terminal.gwt.DefaultWidgetSet.gwtar" /> -->
+            <!-- <fileset dir="${result-precompiled-widgetsets}" includes="com/vaadin/DefaultWidgetSet.gwtar" /> -->
 
             <!-- TODO GWT related license files etc. should be in subdirectories -->
         	

client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java

 import com.google.gwt.core.ext.typeinfo.TypeOracle;
 import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
 import com.google.gwt.user.rebind.SourceWriter;
+import com.vaadin.client.ui.dd.VAcceptCriterion;
+import com.vaadin.client.ui.dd.VAcceptCriterionFactory;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion;
-import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterionFactory;
 
 /**
  * GWT generator to build {@link VAcceptCriterionFactory} implementation
         ClassSourceFileComposerFactory composer = null;
         composer = new ClassSourceFileComposerFactory(packageName, className);
         composer.addImport("com.google.gwt.core.client.GWT");
-        composer.setSuperclass("com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterionFactory");
+        composer.setSuperclass("com.vaadin.client.ui.dd.VAcceptCriterionFactory");
         SourceWriter sourceWriter = composer.createSourceWriter(context,
                 printWriter);
 

client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorBundleLoaderFactory.java

 import com.google.gwt.core.ext.typeinfo.TypeOracle;
 import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
 import com.google.gwt.user.rebind.SourceWriter;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.metadata.ConnectorBundleLoader;
+import com.vaadin.client.metadata.InvokationHandler;
+import com.vaadin.client.metadata.ProxyHandler;
+import com.vaadin.client.metadata.TypeData;
+import com.vaadin.client.metadata.TypeDataBundle;
+import com.vaadin.client.metadata.TypeDataStore;
+import com.vaadin.client.ui.UnknownComponentConnector;
 import com.vaadin.shared.annotations.Delayed;
 import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.terminal.gwt.client.ServerConnector;
-import com.vaadin.terminal.gwt.client.metadata.ConnectorBundleLoader;
-import com.vaadin.terminal.gwt.client.metadata.InvokationHandler;
-import com.vaadin.terminal.gwt.client.metadata.ProxyHandler;
-import com.vaadin.terminal.gwt.client.metadata.TypeData;
-import com.vaadin.terminal.gwt.client.metadata.TypeDataBundle;
-import com.vaadin.terminal.gwt.client.metadata.TypeDataStore;
-import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
 import com.vaadin.terminal.gwt.widgetsetutils.metadata.ClientRpcVisitor;
 import com.vaadin.terminal.gwt.widgetsetutils.metadata.ConnectorBundle;
 import com.vaadin.terminal.gwt.widgetsetutils.metadata.ConnectorInitVisitor;

client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java

 import java.util.Collection;
 import java.util.HashSet;
 
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ServerConnector;
 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.ServerConnector;
 
 /**
  * An abstract helper class that can be used to easily build a widgetset with

client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java

  */
 package com.vaadin.terminal.gwt.widgetsetutils;
 
+import com.vaadin.client.ServerConnector;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.terminal.gwt.client.ServerConnector;
 
 /**
  * WidgetMap generator that builds a widgetset that packs all included widgets

client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java

  */
 package com.vaadin.terminal.gwt.widgetsetutils;
 
+import com.vaadin.client.ServerConnector;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.terminal.gwt.client.ServerConnector;
 
 /**
  * WidgetMap generator that builds a widgetset that optimizes the transferred

client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java

 import com.google.gwt.core.ext.typeinfo.TypeOracle;
 import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
 import com.google.gwt.user.rebind.SourceWriter;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.ui.UnknownComponentConnector;
+import com.vaadin.client.ui.UI.UIConnector;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.terminal.gwt.client.ServerConnector;
-import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.UI.UIConnector;
 import com.vaadin.terminal.gwt.server.ClientConnector;
 
 /**
  * <code>
  * &lt;generate-with
  *           class="com.vaadin.terminal.gwt.widgetsetutils.MyWidgetMapGenerator"&gt;
- *          &lt;when-type-is class="com.vaadin.terminal.gwt.client.WidgetMap" /&gt;
+ *          &lt;when-type-is class="com.vaadin.client.WidgetMap" /&gt;
  * &lt;/generate-with&gt;
  * 
  * </code>
         composer.addImport("com.google.gwt.core.client.GWT");
         composer.addImport("java.util.HashMap");
         composer.addImport("com.google.gwt.core.client.RunAsyncCallback");
-        composer.setSuperclass("com.vaadin.terminal.gwt.client.WidgetMap");
+        composer.setSuperclass("com.vaadin.client.WidgetMap");
         SourceWriter sourceWriter = composer.createSourceWriter(context,
                 printWriter);
 

client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ArraySerializer.java

 import com.google.gwt.core.ext.typeinfo.JType;
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.user.rebind.SourceWriter;
-import com.vaadin.terminal.gwt.client.communication.JsonDecoder;
-import com.vaadin.terminal.gwt.client.communication.JsonEncoder;
+import com.vaadin.client.communication.JsonDecoder;
+import com.vaadin.client.communication.JsonEncoder;
 import com.vaadin.terminal.gwt.widgetsetutils.ConnectorBundleLoaderFactory;
 
 public class ArraySerializer extends JsonSerializer {

client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ConnectorBundle.java

 import com.google.gwt.core.ext.typeinfo.NotFoundException;
 import com.google.gwt.core.ext.typeinfo.TypeOracle;
 import com.google.gwt.json.client.JSONValue;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.communication.JSONSerializer;
+import com.vaadin.client.ui.UnknownComponentConnector;
 import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.ServerRpc;
 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.ServerConnector;
-import com.vaadin.terminal.gwt.client.communication.JSONSerializer;
-import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
 
 public class ConnectorBundle {
     private static final String FAIL_IF_NOT_SERIALIZABLE = "vFailIfNotSerializable";
         JClassType serializerInterface = oracle.findType(JSONSerializer.class
                 .getName());
         JType[] deserializeParamTypes = new JType[] {
-                oracle.findType(com.vaadin.terminal.gwt.client.metadata.Type.class
+                oracle.findType(com.vaadin.client.metadata.Type.class
                         .getName()),
                 oracle.findType(JSONValue.class.getName()),
                 oracle.findType(ApplicationConnection.class.getName()) };

client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/JsonSerializer.java

 import com.google.gwt.core.ext.typeinfo.JType;
 import com.google.gwt.json.client.JSONValue;
 import com.google.gwt.user.rebind.SourceWriter;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.communication.JSONSerializer;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.communication.JSONSerializer;
 
 public abstract class JsonSerializer implements GeneratedSerializer {
 

client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/WidgetInitVisitor.java

 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.core.ext.typeinfo.JClassType;
 import com.google.gwt.core.ext.typeinfo.JMethod;
+import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.shared.annotations.DelegateToWidget;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 
 public class WidgetInitVisitor extends TypeVisitor {
 

client/src/com/vaadin/DefaultWidgetSet.gwt.xml

+<module>
+	<!-- This GWT module defines the Vaadin DefaultWidgetSet. This is the module 
+		you want to extend when creating an extended widget set, or when creating 
+		a specialized widget set with a subset of the components. -->
+
+	<!-- Hint for WidgetSetBuilder not to automatically update the file -->
+	<!-- WS Compiler: manually edited -->
+
+	<inherits name="com.vaadin.Vaadin" />
+
+	<entry-point class="com.vaadin.client.ApplicationConfiguration" />
+
+</module>

client/src/com/vaadin/Vaadin.gwt.xml

+
 <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.terminal.gwt.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.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.terminal.gwt.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>

client/src/com/vaadin/VaadinBrowserSpecificOverrides.gwt.xml

+<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>

client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java → client/src/com/vaadin/client/ApplicationConfiguration.java

  * 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;
 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 {
 
      */
     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);
     }-*/;
 

client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java → client/src/com/vaadin/client/ApplicationConnection.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.ArrayList;
 import java.util.Collection;
 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;
 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
     	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;
 
     	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;
     		if (oldSync) {
     			oldSync();
     		}
-    		app.@com.vaadin.terminal.gwt.client.ApplicationConnection::sendPendingVariableChanges()();
+    		app.@com.vaadin.client.ApplicationConnection::sendPendingVariableChanges()();
     	});
     	var oldForceLayout;
     	if ($wnd.vaadin.forceLayout) {
     		if (oldForceLayout) {
     			oldForceLayout();
     		}
-    		app.@com.vaadin.terminal.gwt.client.ApplicationConnection::forceLayout()();
+    		app.@com.vaadin.client.ApplicationConnection::forceLayout()();
     	});
     }-*/;
 

client/src/com/vaadin/terminal/gwt/client/BrowserInfo.java → client/src/com/vaadin/client/BrowserInfo.java

  * 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;

client/src/com/vaadin/terminal/gwt/client/CSSRule.java → client/src/com/vaadin/client/CSSRule.java

  * 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;
 
     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 = [];
     }-*/;
 
     /*
     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);
     }
     }
     } 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);
     }
     }
      */
     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;
     }

client/src/com/vaadin/terminal/gwt/client/ComponentConnector.java → client/src/com/vaadin/client/ComponentConnector.java

  * 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;
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.VPaintable#getState()
+     * @see com.vaadin.client.VPaintable#getState()
      */
     @Override
     public ComponentState getState();

client/src/com/vaadin/terminal/gwt/client/ComponentContainerConnector.java → client/src/com/vaadin/client/ComponentContainerConnector.java

  * 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

client/src/com/vaadin/terminal/gwt/client/ComponentDetail.java → client/src/com/vaadin/client/ComponentDetail.java

  * 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;
 

client/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java → client/src/com/vaadin/client/ComponentDetailMap.java

  * 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;

client/src/com/vaadin/terminal/gwt/client/ComponentLocator.java → client/src/com/vaadin/client/ComponentLocator.java

  * 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;
 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.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.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

client/src/com/vaadin/terminal/gwt/client/ComputedStyle.java → client/src/com/vaadin/client/ComputedStyle.java

  * 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;
      */
     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 

client/src/com/vaadin/terminal/gwt/client/ConnectorHierarchyChangeEvent.java → client/src/com/vaadin/client/ConnectorHierarchyChangeEvent.java

  * 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}

client/src/com/vaadin/terminal/gwt/client/ConnectorMap.java → client/src/com/vaadin/client/ConnectorMap.java

  * 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;

client/src/com/vaadin/terminal/gwt/client/Console.java → client/src/com/vaadin/client/Console.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Set;
 

client/src/com/vaadin/terminal/gwt/client/ContainerResizedListener.java → client/src/com/vaadin/client/ContainerResizedListener.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 /**
  * ContainerResizedListener interface is useful for Widgets that support

client/src/com/vaadin/terminal/gwt/client/DateTimeService.java → client/src/com/vaadin/client/DateTimeService.java

  * 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

client/src/com/vaadin/terminal/gwt/client/DirectionalManagedLayout.java → client/src/com/vaadin/client/DirectionalManagedLayout.java

  * 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();

client/src/com/vaadin/terminal/gwt/client/EventHelper.java → client/src/com/vaadin/client/EventHelper.java

  * 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;

client/src/com/vaadin/terminal/gwt/client/FastStringSet.java → client/src/com/vaadin/client/FastStringSet.java

  * 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;

client/src/com/vaadin/terminal/gwt/client/Focusable.java → client/src/com/vaadin/client/Focusable.java

  * 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

client/src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java → client/src/com/vaadin/client/JavaScriptConnectorHelper.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 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 {
 
                 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;
                 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);
                 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);
             }),
         };
     }-*/;
     /*-{
         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);
         });
     }-*/;
 
     /*-{
         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);
         });
     }-*/;
 

client/src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java → client/src/com/vaadin/client/JavaScriptExtension.java

  * 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.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

client/src/com/vaadin/terminal/gwt/client/LayoutManager.java → client/src/com/vaadin/client/LayoutManager.java

  * 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;
 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.";

client/src/com/vaadin/terminal/gwt/client/LayoutManagerIE8.java → client/src/com/vaadin/client/LayoutManagerIE8.java

  * 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;

client/src/com/vaadin/terminal/gwt/client/LocaleNotLoadedException.java → client/src/com/vaadin/client/LocaleNotLoadedException.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 @SuppressWarnings("serial")
 public class LocaleNotLoadedException extends Exception {

client/src/com/vaadin/terminal/gwt/client/LocaleService.java → client/src/com/vaadin/client/LocaleService.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.HashMap;
 import java.util.Map;

client/src/com/vaadin/terminal/gwt/client/MeasuredSize.java → client/src/com/vaadin/client/MeasuredSize.java

  * 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;

client/src/com/vaadin/terminal/gwt/client/MouseEventDetailsBuilder.java → client/src/com/vaadin/client/MouseEventDetailsBuilder.java

  * 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;

client/src/com/vaadin/terminal/gwt/client/NullConsole.java → client/src/com/vaadin/client/NullConsole.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Set;
 

client/src/com/vaadin/terminal/gwt/client/Paintable.java → client/src/com/vaadin/client/Paintable.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 /**
  * An interface used by client-side widgets or paintable parts to receive

client/src/com/vaadin/terminal/gwt/client/RenderInformation.java → client/src/com/vaadin/client/RenderInformation.java

  * 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;
 

client/src/com/vaadin/terminal/gwt/client/RenderSpace.java → client/src/com/vaadin/client/RenderSpace.java

  * 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.

client/src/com/vaadin/terminal/gwt/client/ResourceLoader.java → client/src/com/vaadin/client/ResourceLoader.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Collection;
 import java.util.HashMap;
             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 ) {

client/src/com/vaadin/terminal/gwt/client/ServerConnector.java → client/src/com/vaadin/client/ServerConnector.java

  * 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

client/src/com/vaadin/terminal/gwt/client/SimpleTree.java → client/src/com/vaadin/client/SimpleTree.java

  * 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;

client/src/com/vaadin/terminal/gwt/client/StyleConstants.java → client/src/com/vaadin/client/StyleConstants.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 public class StyleConstants {
 

client/src/com/vaadin/terminal/gwt/client/SuperDevMode.java → client/src/com/vaadin/client/SuperDevMode.java

  * 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;
 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.

client/src/com/vaadin/terminal/gwt/client/SynchronousXHR.java → client/src/com/vaadin/client/SynchronousXHR.java

  * 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;
 

client/src/com/vaadin/terminal/gwt/client/TooltipInfo.java → client/src/com/vaadin/client/TooltipInfo.java

  * 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 {
 

client/src/com/vaadin/terminal/gwt/client/UIDL.java → client/src/com/vaadin/client/UIDL.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.HashSet;
 import java.util.Iterator;

client/src/com/vaadin/terminal/gwt/client/Util.java → client/src/com/vaadin/client/Util.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 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 {
 

client/src/com/vaadin/terminal/gwt/client/VCaption.java → client/src/com/vaadin/client/VCaption.java

  * 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.ComponentState;
-import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.Icon;
 
 public class VCaption extends HTML {
 

client/src/com/vaadin/terminal/gwt/client/VCaptionWrapper.java → client/src/com/vaadin/client/VCaptionWrapper.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.google.gwt.user.client.ui.FlowPanel;
 

client/src/com/vaadin/terminal/gwt/client/VConsole.java → client/src/com/vaadin/client/VConsole.java

  * 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;
 

client/src/com/vaadin/terminal/gwt/client/VDebugConsole.java → client/src/com/vaadin/client/VDebugConsole.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Collection;
 import java.util.Date;
 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
     /*
      * (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) {
     /*
      * (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) {
     /*
      * (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) {
     /*
      * (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) {

client/src/com/vaadin/terminal/gwt/client/VErrorMessage.java → client/src/com/vaadin/client/VErrorMessage.java

  * 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";

client/src/com/vaadin/terminal/gwt/client/VSchedulerImpl.java → client/src/com/vaadin/client/VSchedulerImpl.java

  * 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;
 

client/src/com/vaadin/terminal/gwt/client/VTooltip.java → client/src/com/vaadin/client/VTooltip.java

  * 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;
 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

client/src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java → client/src/com/vaadin/client/VUIDLBrowser.java

 /**
  * 
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Iterator;
 import java.util.Set;
 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?

client/src/com/vaadin/terminal/gwt/client/ValueMap.java → client/src/com/vaadin/client/ValueMap.java

 /**
  * 
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.HashSet;
 import java.util.Set;

client/src/com/vaadin/terminal/gwt/client/WidgetInstantiator.java → client/src/com/vaadin/client/WidgetInstantiator.java

  * 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.

client/src/com/vaadin/terminal/gwt/client/WidgetLoader.java → client/src/com/vaadin/client/WidgetLoader.java

  * 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;
 

client/src/com/vaadin/terminal/gwt/client/WidgetMap.java → client/src/com/vaadin/client/WidgetMap.java

  * 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;
 

client/src/com/vaadin/terminal/gwt/client/WidgetSet.java → client/src/com/vaadin/client/WidgetSet.java

  * 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 {
     /**

client/src/com/vaadin/terminal/gwt/client/communication/AbstractServerConnectorEvent.java → client/src/com/vaadin/client/communication/AbstractServerConnectorEvent.java

  * 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> {

client/src/com/vaadin/terminal/gwt/client/communication/DiffJSONSerializer.java → client/src/com/vaadin/client/communication/DiffJSONSerializer.java

  * 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> {
     /**

client/src/com/vaadin/terminal/gwt/client/communication/HasJavaScriptConnectorHelper.java → client/src/com/vaadin/client/communication/HasJavaScriptConnectorHelper.java

  * 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();

client/src/com/vaadin/terminal/gwt/client/communication/JSONSerializer.java → client/src/com/vaadin/client/communication/JSONSerializer.java

  * 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

client/src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java → client/src/com/vaadin/client/communication/JsonDecoder.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
 import java.util.ArrayList;
 import java.util.Collection;
 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

client/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java → client/src/com/vaadin/client/communication/JsonEncoder.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.client.communication;
 
 import java.util.Collection;
 import java.util.List;
 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

client/src/com/vaadin/terminal/gwt/client/communication/RpcManager.java → client/src/com/vaadin/client/communication/RpcManager.java

  * 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

client/src/com/vaadin/terminal/gwt/client/communication/RpcProxy.java → client/src/com/vaadin/client/communication/RpcProxy.java

  * 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.

client/src/com/vaadin/terminal/gwt/client/communication/StateChangeEvent.java → client/src/com/vaadin/client/communication/StateChangeEvent.java

  * 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> {

client/src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java → client/src/com/vaadin/client/communication/URLReference_Serializer.java

  * 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> {
 

client/src/com/vaadin/terminal/gwt/client/extensions/AbstractExtensionConnector.java → client/src/com/vaadin/client/extensions/AbstractExtensionConnector.java

  * 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;

client/src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java → client/src/com/vaadin/client/extensions/javascriptmanager/JavaScriptManagerConnector.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.extensions.javascriptmanager;
+package com.vaadin.client.extensions.javascriptmanager;
 
 import java.util.HashSet;
 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)
         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);
         });
     }-*/;
 

client/src/com/vaadin/terminal/gwt/client/metadata/AsyncBundleLoader.java → client/src/com/vaadin/client/metadata/AsyncBundleLoader.java

 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 import java.util.ArrayList;
 import java.util.Collections;

client/src/com/vaadin/terminal/gwt/client/metadata/BundleLoadCallback.java → client/src/com/vaadin/client/metadata/BundleLoadCallback.java

 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public interface BundleLoadCallback {
     public void loaded();

client/src/com/vaadin/terminal/gwt/client/metadata/ConnectorBundleLoader.java → client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java

 @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";

client/src/com/vaadin/terminal/gwt/client/metadata/InvokationHandler.java → client/src/com/vaadin/client/metadata/InvokationHandler.java

  * 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);

client/src/com/vaadin/terminal/gwt/client/metadata/Invoker.java → client/src/com/vaadin/client/metadata/Invoker.java

 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public interface Invoker {
     public Object invoke(Object target, Object... params);

client/src/com/vaadin/terminal/gwt/client/metadata/Method.java → client/src/com/vaadin/client/metadata/Method.java

 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public class Method {
 

client/src/com/vaadin/terminal/gwt/client/metadata/NoDataException.java → client/src/com/vaadin/client/metadata/NoDataException.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public class NoDataException extends Exception {
 

client/src/com/vaadin/terminal/gwt/client/metadata/Property.java → client/src/com/vaadin/client/metadata/Property.java

 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 import com.vaadin.shared.annotations.DelegateToWidget;
 

client/src/com/vaadin/terminal/gwt/client/metadata/ProxyHandler.java → client/src/com/vaadin/client/metadata/ProxyHandler.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public interface ProxyHandler {
 

client/src/com/vaadin/terminal/gwt/client/metadata/Type.java → client/src/com/vaadin/client/metadata/Type.java

 /* 
 @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;

client/src/com/vaadin/terminal/gwt/client/metadata/TypeData.java → client/src/com/vaadin/client/metadata/TypeData.java

 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 public class TypeData {
 

client/src/com/vaadin/terminal/gwt/client/metadata/TypeDataBundle.java → client/src/com/vaadin/client/metadata/TypeDataBundle.java

 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 import com.google.gwt.core.client.RunAsyncCallback;
 

client/src/com/vaadin/terminal/gwt/client/metadata/TypeDataStore.java → client/src/com/vaadin/client/metadata/TypeDataStore.java

 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.metadata;
+package com.vaadin.client.metadata;
 
 import java.util.Collection;
 import java.util.Collections;
 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";

client/src/com/vaadin/terminal/gwt/client/ui/AbstractClickEventHandler.java → client/src/com/vaadin/client/ui/AbstractClickEventHandler.java

  * 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;
 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 {

client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java → client/src/com/vaadin/client/ui/AbstractComponentConnector.java

  * 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;
 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.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;
 
 public abstract class AbstractComponentConnector extends AbstractConnector
         implements ComponentConnector {
      * (non-Javadoc)
      * 
      * @see
-     * com.vaadin.terminal.gwt.client.ComponentConnector#delegateCaptionHandling
+     * com.vaadin.client.ComponentConnector#delegateCaptionHandling
      * ()
      */
     @Override
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.ComponentConnector#isReadOnly()
+     * @see com.vaadin.client.ComponentConnector#isReadOnly()
      */
     @Override
     @Deprecated
      * (non-Javadoc)
      * 
      * @see
-     * com.vaadin.terminal.gwt.client.ComponentConnector#getTooltipInfo(com.
+     * com.vaadin.client.ComponentConnector#getTooltipInfo(com.
      * google.gwt.dom.client.Element)
      */
     @Override

client/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentContainerConnector.java → client/src/com/vaadin/client/ui/AbstractComponentContainerConnector.java

  * 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,
      * (non-Javadoc)
      * 
      * @see
-     * com.vaadin.terminal.gwt.client.ComponentContainerConnector#getChildren()
+     * com.vaadin.client.ComponentContainerConnector#getChildren()
      */
     @Override
     public List<ComponentConnector> getChildComponents() {
      * (non-Javadoc)
      * 
      * @see
-     * com.vaadin.terminal.gwt.client.ComponentContainerConnector#setChildren
+     * com.vaadin.client.ComponentContainerConnector#setChildren
      * (java.util.Collection)
      */
     @Override
     /*
      * (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) {

client/src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java → client/src/com/vaadin/client/ui/AbstractConnector.java

  * 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;
 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;
 
 /**
  * An abstract implementation of Connector.
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.VPaintable#getConnection()
+     * @see com.vaadin.client.VPaintable#getConnection()
      */
     @Override
     public final ApplicationConnection getConnection() {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.Connector#getId()
+     * @see com.vaadin.client.Connector#getId()
      */
     @Override
     public String getConnectorId() {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.ServerConnector#onUnregister()
+     * @see com.vaadin.client.ServerConnector#onUnregister()
      */
     @Override
     public void onUnregister() {

client/src/com/vaadin/terminal/gwt/client/ui/AbstractFieldConnector.java → client/src/com/vaadin/client/ui/AbstractFieldConnector.java

  * 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 {
 

client/src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java → client/src/com/vaadin/client/ui/AbstractLayoutConnector.java

  * 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;
 

client/src/com/vaadin/terminal/gwt/client/ui/Action.java → client/src/com/vaadin/client/ui/Action.java

  * 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;
 
 /**
  *