Merge branch 'master' into layoutgraph

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

2199 files changed, 6958 insertions, 4650 deletions

diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index 0b059a69e9..f695551cf2 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -6,7 +6,7 @@
 	<portlet>
 		<portlet-name>JSR286TestPortlet</portlet-name>
 		<display-name>Vaadin Portlet 2.0 Test</display-name>
-		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
+		<portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class>
 		<init-param>
 			<name>application</name>
 			<value>com.vaadin.tests.integration.JSR286PortletApplication</value>
@@ -44,7 +44,7 @@
         <portlet-name>Vaadin Liferay Theme Portlet</portlet-name>
         <display-name>Vaadin Liferay Theme</display-name>
         
-        <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
+        <portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class>
         <init-param>
             <name>application</name>
             <value>com.vaadin.tests.integration.LiferayThemeDemo</value>
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 5b250d86f2..58a125c10f 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -28,7 +28,7 @@
 	<!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet -->
 	<servlet>
 		<servlet-name>IntegrationTest</servlet-name>
-		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
 			<param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value>
diff --git a/WebContent/statictestfiles/EmbedSizeHostPage.html b/WebContent/statictestfiles/EmbedSizeHostPage.html
index 06dfd5dfd7..2576a200db 100644
--- a/WebContent/statictestfiles/EmbedSizeHostPage.html
+++ b/WebContent/statictestfiles/EmbedSizeHostPage.html
@@ -13,7 +13,7 @@ vaadin.vaadinConfigurations = {};
 if (!vaadin.themesLoaded) { vaadin.themesLoaded = {}; }
 vaadin.debug = true;
 document.write('<iframe tabIndex="-1" id="__gwt_historyFrame" style="position:absolute;width:0;height:0;border:0;overflow:hidden;" src="javascript:false"></iframe>');
-document.write("<script language='javascript' src='/VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/com.vaadin.terminal.gwt.DefaultWidgetSet.nocache.js?1321018813162'><\/script>");
+document.write("<script language='javascript' src='/VAADIN/widgetsets/com.vaadin.DefaultWidgetSet/com.vaadin.DefaultWidgetSet.nocache.js?1321018813162'><\/script>");
 }
 vaadin.vaadinConfigurations["runcomvaadintestsintegrationEmbedSizeTest-225840176"] = {appUri:'/run/com.vaadin.tests.integration.EmbedSizeTest', themeUri:"/VAADIN/themes/reindeer", versionInfo : {vaadinVersion:"9.9.9.INTERNAL-DEBUG-BUILD",applicationVersion:"NONVERSIONED"},"comErrMsg": {"caption":"Communication problem","message" : "Take note of any unsaved data, and <u>click here<\/u> to continue.","url" : null},"authErrMsg": {"caption":"Authentication problem","message" : "Take note of any unsaved data, and <u>click here<\/u> to continue.","url" : null}};
 //]]>
@@ -32,7 +32,7 @@ vaadin.themesLoaded['reindeer'] = true;
 </script>
 <script type="text/javascript">
 //<![CDATA[
-setTimeout('if (typeof com_vaadin_terminal_gwt_DefaultWidgetSet == "undefined") {alert("Failed to load the widgetset: /VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/com.vaadin.terminal.gwt.DefaultWidgetSet.nocache.js?1321018813162")};',15000);
+setTimeout('if (typeof com_vaadin_DefaultWidgetSet == "undefined") {alert("Failed to load the widgetset: /VAADIN/widgetsets/com.vaadin.DefaultWidgetSet/com.vaadin.DefaultWidgetSet.nocache.js?1321018813162")};',15000);
 //]]>
 </script>
 <div style="width: 80%; border: 1px solid black">
diff --git a/build/build.xml b/build/build.xml
index d905bb9c6f..c234480877 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -260,7 +260,7 @@
            	<!-- VaadinClasses and data classes are used by TestBench tests also -->
             <fileset dir="${result-classes-junit}" />
             <!-- test resources -->
-            <fileset dir="tests/testbench">
+            <fileset dir="uitest/src">
                 <include name="${vaadin-package}/tests/**/*" />
                 <!-- Pre-processed versions of these copied above -->
                 <exclude name="**/*.java" />
@@ -270,7 +270,7 @@
             </fileset>
 
         	<!-- Include files required by the DemoLauncher/DevelopmentServerLauncher -->
-            <fileset dir="tests/testbench">
+            <fileset dir="uitest/src">
         		<include name="${vaadin-package}/launcher/jetty-webdefault.xml" />
         		<include name="${vaadin-package}/launcher/keystore" />
             </fileset>
@@ -286,7 +286,7 @@
                 <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 -->
@@ -347,9 +347,9 @@
         Source directories in the project are
          * src (Vaadin core)
          * sass/src (SASS compiler)
-         * tests/testbench (TestBench test cases)
-         * tests/server-side (Server-side JUnit test cases)
-         * tests/client-side (Client-side JUnit test cases)
+         * uitest/src (TestBench test cases)
+         * server/tests/src (Server-side JUnit test cases)
+         * client/tests/src (Client-side JUnit test cases)
 
         These are copied to 
          * ${result-path}/src/core
@@ -443,22 +443,22 @@
 
         <copy todir="${result-src-testbench}">
             <filterset refid="version-and-license"/>
-            <fileset dir="tests/testbench">
+            <fileset dir="uitest/src">
                 <patternset refid="preprocessable-files" />
             </fileset>
         </copy>
         <copy todir="${result-src-junit}">
             <filterset refid="version-and-license"/>
-            <fileset dir="tests/server-side">
+            <fileset dir="server/tests/src">
                 <patternset refid="preprocessable-files" />
             </fileset>
-            <fileset dir="tests/client-side">
+            <fileset dir="client/tests/src">
                 <patternset refid="preprocessable-files" />
             </fileset>
         </copy>
         <copy todir="${result-src-sass-junit}">
             <filterset refid="version-and-license"/>
-            <fileset dir="tests/sass/src">
+            <fileset dir="sass/tests/src">
                 <patternset refid="preprocessable-files" />
             </fileset>
         </copy>
@@ -495,23 +495,23 @@
             </fileset>
         </copy>
         <copy todir="${result-src-testbench}">
-            <fileset dir="tests/testbench">
+            <fileset dir="uitest/src">
                 <patternset refid="non-preprocessable-files" />
             </fileset>
         </copy>
         <copy todir="${result-src-junit}">
-            <fileset dir="tests/server-side">
+            <fileset dir="server/tests/src">
                 <patternset refid="non-preprocessable-files" />
             </fileset>
-            <fileset dir="tests/client-side">
+            <fileset dir="client/tests/src">
                 <patternset refid="non-preprocessable-files" />
             </fileset>
         </copy>
         <copy todir="${result-src-sass-junit}">
-            <fileset dir="tests/sass/src">
+            <fileset dir="sass/tests/src">
                 <patternset refid="non-preprocessable-files" />
             </fileset>
-            <fileset dir="tests/sass/resources">
+            <fileset dir="sass/tests/resources">
             	<!-- test resources (files to compile and compare etc.) -->
             </fileset>
         </copy>
@@ -664,6 +664,11 @@
 		</javac>
     </target>
     
+	<target name="compile-sass-parser">
+	<javacc target="${parserDir}/Parser.jj" javacchome="${JavaCChome}">
+	</javacc>
+	</target>
+	
     <target name="compile-sass" depends="init, preprocess-src">
     	<!-- TODO also perform javacc compilation of the parser -->
         <mkdir dir="${result-classes-sass}" />
@@ -765,7 +770,7 @@
     <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>
     
@@ -851,14 +856,14 @@
         <echo file="${output-dir}/META-INF/VERSION">${version.full}</echo> 
     	
     	<!-- Replace GWT versioning with Vaadin versioning -->
-    	<echo file="${result-classes-gwt}/com/google/gwt/dev/About.properties">gwt.version=${gwt-version}.vaadin${version.full}</echo>
+    	<echo file="${result-classes-gwt}/com/google/gwt/dev/About.properties">gwt.version=${version.full}</echo>
         	
         <jarjar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}"
              compress="true" manifest="build/package/META-INF/MANIFEST.MF" duplicate="preserve" index="true" >
             <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}" />
@@ -881,7 +886,7 @@
         	<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/**/*" />
@@ -897,7 +902,7 @@
             </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 -->
         	
@@ -1290,8 +1295,8 @@
             </classpath>
 
             <batchtest fork="yes">
-                <fileset dir="tests/server-side" includes="**/*.java" excludes="**/Abstract*.java,com/vaadin/tests/data/bean/*.java,com/vaadin/tests/util/*.java,**/VaadinClasses.java" />
-                <fileset dir="tests/client-side" includes="**/*.java" excludes="**/Abstract*.java" />
+                <fileset dir="server/tests/src" includes="**/*.java" excludes="**/Abstract*.java,com/vaadin/tests/data/bean/*.java,com/vaadin/tests/util/*.java,**/VaadinClasses.java" />
+                <fileset dir="client/tests/src" includes="**/*.java" excludes="**/Abstract*.java" />
             </batchtest>
         </junit>
     </target>
@@ -1332,7 +1337,7 @@
         <property name="package.filename" value="${result-path}/${test-war-filename}"/>
 
         <!-- Run the separate test script. -->
-        <ant antfile="tests/test.xml" target="test-package" inheritall="false" inheritrefs="true">
+        <ant antfile="uitest/test.xml" target="test-package" inheritall="false" inheritrefs="true">
             <!-- This is provided so that the test script can copy the -->
             <!-- "tests" classes after unpacking the package.          -->
             <property name="output-dir" value="${output-dir}"/>
@@ -1368,7 +1373,7 @@
         <property name="tests.war" location="${result-path}/${test-war-filename}" />
         
         <!-- Run the separate test script. -->
-        <ant antfile="tests/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="true">
+        <ant antfile="uitest/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="true">
               <!-- This is provided so that the test script can copy the -->
               <!-- "tests" classes after unpacking the package.          -->
               <property name="output-dir" value="${output-dir}"/>
@@ -1382,6 +1387,7 @@
               <property name="deps.initialized"  value="${deps.initialized}"/>
         </ant>
     </target>
+	
 </project>
 
 <!-- These are for emacs. -->
diff --git a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
index 45079ac21f..5b17ae4902 100644
--- a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
+++ b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
@@ -83,8 +83,7 @@ public class CompileDefaultTheme {
         String stylesCssName = stylesCssDir + "styles.css";
 
         // Process as SASS file
-        File inputFile = new File(stylesCssDir + "styles.scss");
-        ScssStylesheet scss = ScssStylesheet.get(inputFile);
+        ScssStylesheet scss = ScssStylesheet.get(stylesCssDir + "styles.scss");
         scss.compile();
 
         BufferedWriter out = new BufferedWriter(new FileWriter(stylesCssName));
diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml
index 0be10a5b9d..f42b58ff0f 100644
--- a/build/package/build-widgetset.xml
+++ b/build/package/build-widgetset.xml
@@ -143,7 +143,7 @@ See configure target to adjust this buildfile.
         <!-- Create the directory if it does not already exist. -->
         <mkdir dir="${src-location}/${widgetset-path}"/>
         
-        <java classname="com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder"
+        <java classname="com.vaadin.server.widgetsetutils.WidgetSetBuilder"
               failonerror="yes" fork="yes" maxmemory="256m">
             <arg value="${widgetset}"/>
             <jvmarg value="-Xss1024k"/>
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java b/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
index 0af1dca8bc..5b9cd399c7 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import java.io.PrintWriter;
 import java.util.Date;
@@ -27,9 +27,9 @@ import com.google.gwt.core.ext.typeinfo.JClassType;
 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
@@ -87,7 +87,7 @@ public class AcceptCriteriaFactoryGenerator extends Generator {
         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);
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
index f57a58a557..70120b944d 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorBundleLoaderFactory.java b/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
index 752f290a42..aa220225c9 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorBundleLoaderFactory.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -29,28 +29,29 @@ import com.google.gwt.core.ext.typeinfo.NotFoundException;
 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.server.widgetsetutils.metadata.ClientRpcVisitor;
+import com.vaadin.server.widgetsetutils.metadata.ConnectorBundle;
+import com.vaadin.server.widgetsetutils.metadata.ConnectorInitVisitor;
+import com.vaadin.server.widgetsetutils.metadata.GeneratedSerializer;
+import com.vaadin.server.widgetsetutils.metadata.Property;
+import com.vaadin.server.widgetsetutils.metadata.ServerRpcVisitor;
+import com.vaadin.server.widgetsetutils.metadata.StateInitVisitor;
+import com.vaadin.server.widgetsetutils.metadata.TypeVisitor;
+import com.vaadin.server.widgetsetutils.metadata.WidgetInitVisitor;
 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.widgetsetutils.metadata.ClientRpcVisitor;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.ConnectorBundle;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.ConnectorInitVisitor;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.GeneratedSerializer;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.Property;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.ServerRpcVisitor;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.StateInitVisitor;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.TypeVisitor;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.WidgetInitVisitor;
 
 public class ConnectorBundleLoaderFactory extends Generator {
 
@@ -604,6 +605,8 @@ public class ConnectorBundleLoaderFactory extends Generator {
         // Eager connectors and all RPC interfaces are loaded by default
         eagerBundle.processTypes(eagerLogger,
                 connectorsByLoadStyle.get(LoadStyle.EAGER));
+        eagerBundle.processType(eagerLogger, typeOracle
+                .findType(UnknownComponentConnector.class.getCanonicalName()));
         eagerBundle.processSubTypes(eagerLogger,
                 typeOracle.getType(ClientRpc.class.getName()));
         eagerBundle.processSubTypes(eagerLogger,
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java b/client-compiler/src/com/vaadin/server/widgetsetutils/CustomWidgetMapGenerator.java
index 7025393fe2..250bfbb4a1 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/CustomWidgetMapGenerator.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 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
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java b/client-compiler/src/com/vaadin/server/widgetsetutils/EagerWidgetMapGenerator.java
index 00efcbd25c..568dc939e7 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/EagerWidgetMapGenerator.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.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
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java b/client-compiler/src/com/vaadin/server/widgetsetutils/LazyWidgetMapGenerator.java
index 3906c10eda..9e46b6d9dd 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/LazyWidgetMapGenerator.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.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
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java b/client-compiler/src/com/vaadin/server/widgetsetutils/WidgetMapGenerator.java
index 99f3a1d17b..b90791d61b 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/WidgetMapGenerator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -35,13 +35,13 @@ import com.google.gwt.core.ext.typeinfo.JClassType;
 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.server.ClientConnector;
 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;
 
 /**
  * WidgetMapGenerator's are GWT generator to build WidgetMapImpl dynamically
@@ -69,8 +69,8 @@ import com.vaadin.terminal.gwt.server.ClientConnector;
  * <pre>
  * <code>
  * &lt;generate-with
- *           class="com.vaadin.terminal.gwt.widgetsetutils.MyWidgetMapGenerator"&gt;
- *          &lt;when-type-is class="com.vaadin.terminal.gwt.client.WidgetMap" /&gt;
+ *           class="com.vaadin.server.widgetsetutils.MyWidgetMapGenerator"&gt;
+ *          &lt;when-type-is class="com.vaadin.client.WidgetMap" /&gt;
  * &lt;/generate-with&gt;
  * 
  * </code>
@@ -139,7 +139,7 @@ public class WidgetMapGenerator extends Generator {
         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);
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java b/client-compiler/src/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java
index bcfa9990ec..4137662b35 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ArraySerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
index 1c729e9841..4ab5cccb2e 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ArraySerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
@@ -14,16 +14,16 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.typeinfo.JArrayType;
 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.terminal.gwt.widgetsetutils.ConnectorBundleLoaderFactory;
+import com.vaadin.client.communication.JsonDecoder;
+import com.vaadin.client.communication.JsonEncoder;
+import com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory;
 
 public class ArraySerializer extends JsonSerializer {
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ClientRpcVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
index d5a78b86b9..3b78519a0d 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ClientRpcVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.util.Set;
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ConnectorBundle.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
index 1db551ed9a..f5c604cbf5 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ConnectorBundle.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -27,13 +27,14 @@ import com.google.gwt.core.ext.typeinfo.JType;
 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;
 
 public class ConnectorBundle {
     private static final String FAIL_IF_NOT_SERIALIZABLE = "vFailIfNotSerializable";
@@ -89,8 +90,7 @@ public class ConnectorBundle {
         JClassType serializerInterface = oracle.findType(JSONSerializer.class
                 .getName());
         JType[] deserializeParamTypes = new JType[] {
-                oracle.findType(com.vaadin.terminal.gwt.client.metadata.Type.class
-                        .getName()),
+                oracle.findType(com.vaadin.client.metadata.Type.class.getName()),
                 oracle.findType(JSONValue.class.getName()),
                 oracle.findType(ApplicationConnection.class.getName()) };
         String deserializeMethodName = "deserialize";
@@ -431,7 +431,9 @@ public class ConnectorBundle {
     }
 
     private static boolean isConnected(JClassType type) {
-        return type.isAnnotationPresent(Connect.class);
+        return type.isAnnotationPresent(Connect.class)
+                || type.getQualifiedSourceName().equals(
+                        UnknownComponentConnector.class.getCanonicalName());
     }
 
     public static boolean isConnectedComponentConnector(JClassType type) {
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ConnectorInitVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
index 09cdaddc31..3e863516a5 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ConnectorInitVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.TreeLogger.Type;
@@ -14,11 +14,14 @@ public class ConnectorInitVisitor extends TypeVisitor {
     @Override
     public void visitConnector(TreeLogger logger, JClassType type,
             ConnectorBundle bundle) {
-        logger.log(Type.INFO, type.getName() + " will be in the "
-                + bundle.getName().replaceAll("^_*", "") + " bundle");
         Connect connectAnnotation = type.getAnnotation(Connect.class);
-        bundle.setIdentifier(type, connectAnnotation.value().getCanonicalName());
-        bundle.setNeedsGwtConstructor(type);
+        if (connectAnnotation != null) {
+            logger.log(Type.INFO, type.getName() + " will be in the "
+                    + bundle.getName().replaceAll("^_*", "") + " bundle");
+            bundle.setIdentifier(type, connectAnnotation.value()
+                    .getCanonicalName());
+            bundle.setNeedsGwtConstructor(type);
+        }
     }
 
 }
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/CustomSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
index 11252c4acb..a0105b4bf3 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/CustomSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.core.ext.typeinfo.JClassType;
 import com.google.gwt.user.rebind.SourceWriter;
-import com.vaadin.terminal.gwt.widgetsetutils.ConnectorBundleLoaderFactory;
+import com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory;
 
 public class CustomSerializer implements GeneratedSerializer {
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/EnumSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
index 324b555300..5590e6cd7a 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/EnumSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.typeinfo.JEnumConstant;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/FieldProperty.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
index c4c2a50e1c..a7896a5bf6 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/FieldProperty.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/GeneratedSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
index 0cfde7748c..8f6c8696fd 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/GeneratedSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/JsonSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
index accee84fe7..6e521dc763 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/JsonSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
 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 {
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/MethodProperty.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
index 431ead7f96..318519f37d 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/MethodProperty.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/Property.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java
index 5ef0293688..b55b70784a 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/Property.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.lang.annotation.Annotation;
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ServerRpcVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
index 4c0fc94500..cbcfc3075b 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ServerRpcVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.util.Set;
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/StateInitVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
index 49cf687412..17ea62b249 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/StateInitVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.typeinfo.JClassType;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/TypeVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
index cda849f564..7191093755 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/TypeVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/WidgetInitVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
index 2b0e3e1f61..fbbabe084d 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/WidgetInitVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.util.Collection;
 
@@ -11,8 +11,8 @@ import com.google.gwt.core.ext.TreeLogger.Type;
 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 {
 
diff --git a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java
index 7e06dfc205..51d5ec8187 100755
--- a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java
+++ b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java
@@ -19,7 +19,7 @@ import java.lang.reflect.Method;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder;
+import com.vaadin.server.widgetsetutils.WidgetSetBuilder;
 
 /**
  * A wrapper for the GWT 1.6 compiler that runs the compiler in a new thread.
@@ -33,7 +33,7 @@ import com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder;
  * 
  * A typical invocation would use e.g. the following arguments
  * 
- * "-out WebContent/VAADIN/widgetsets com.vaadin.terminal.gwt.DefaultWidgetSet"
+ * "-out WebContent/VAADIN/widgetsets com.vaadin.DefaultWidgetSet"
  * 
  * In addition, larger memory usage settings for the VM should be used, e.g.
  * 
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/server/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml b/client/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml
index bd91d05b02..c127d3bb21 100644
--- a/server/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml
+++ b/client/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml
@@ -2,5 +2,5 @@
 	<!-- WS Compiler: manually edited  -->
 
 	<!-- Inherit the DefaultWidgetSet -->
-	<inherits name="com.vaadin.terminal.gwt.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/tests/client-side/com/vaadin/terminal/gwt/client/ApplicationConnectionTestURLGeneration.java b/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
index 3535d50529..da5970d64d 100644
--- a/tests/client-side/com/vaadin/terminal/gwt/client/ApplicationConnectionTestURLGeneration.java
+++ b/client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
@@ -1,10 +1,10 @@
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.client.ApplicationConnection;
 
 public class ApplicationConnectionTestURLGeneration {
 
diff --git a/tests/client-side/com/vaadin/terminal/gwt/client/DateTimeServiceTest.java b/client/tests/src/com/vaadin/client/DateTimeServiceTest.java
index b111faf5bc..6852e9ec3f 100755
--- a/tests/client-side/com/vaadin/terminal/gwt/client/DateTimeServiceTest.java
+++ b/client/tests/src/com/vaadin/client/DateTimeServiceTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -7,7 +7,7 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import com.vaadin.terminal.gwt.client.DateTimeService;
+import com.vaadin.client.DateTimeService;
 
 public class DateTimeServiceTest extends TestCase {
 
diff --git a/tests/client-side/com/vaadin/terminal/gwt/client/TestVBrowserDetailsUserAgentParser.java b/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
index 34b64606a5..04e8be699b 100644
--- a/tests/client-side/com/vaadin/terminal/gwt/client/TestVBrowserDetailsUserAgentParser.java
+++ b/client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
@@ -1,4 +1,4 @@
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.client;
 
 import com.vaadin.shared.VBrowserDetails;
 
diff --git a/sass/README b/sass/README
new file mode 100644
index 0000000000..4d9482763f
--- /dev/null
+++ b/sass/README
@@ -0,0 +1,11 @@
+This project compiles SCSS into CSS.
+It parses the SCSS into a tree.
+
+Classes
+=======
+SassCompiler: This is the main class that can be run from command line. First parameter is for a scss file to be compiled. Second parameter is optional and is a reference to a file where you want the compiled css. If file doesn't exist, it will be deleted. If file exists, it will be deleted and recreated. If second argument is left out, the css will be printed into standard out.
+ScssStylesheet: When Scss/Css is parsed in, it will be represented in memory as this file. Reference is got through static get(File file) where file is input.
+Parser: A JavaCC compiled java class that parses the input and notifies the DocumentHandler on what nodes it encounters.
+Parser.jj: Source for the Parser class.
+SCSSDocumentHandlerImpl: Class that takes in calls from parser and creates nodes into ScssStylesheet based on those calls.
+Node package: All the nodes representing the Scss/Css in tree format
\ No newline at end of file
diff --git a/sass/src/com/vaadin/sass/SassCompiler.java b/sass/src/com/vaadin/sass/SassCompiler.java
index 8e4df2a62e..555797066b 100644
--- a/sass/src/com/vaadin/sass/SassCompiler.java
+++ b/sass/src/com/vaadin/sass/SassCompiler.java
@@ -35,8 +35,10 @@ public class SassCompiler {
             input = args[0];
             output = args[1];
         }
-        File inputFile = new File(input);
-        ScssStylesheet scss = ScssStylesheet.get(inputFile);
+
+        // ScssStylesheet.setStylesheetResolvers(new VaadinResolver());
+
+        ScssStylesheet scss = ScssStylesheet.get(input);
         scss.compile();
         if (output == null) {
             System.out.println(scss.toString());
diff --git a/sass/src/com/vaadin/sass/ScssServlet.java b/sass/src/com/vaadin/sass/ScssServlet.java
index d85237aff2..a345ca1583 100644
--- a/sass/src/com/vaadin/sass/ScssServlet.java
+++ b/sass/src/com/vaadin/sass/ScssServlet.java
@@ -40,7 +40,7 @@ public class ScssServlet extends HttpServlet {
                 String scssPath = cssPath.replace(".css", ".scss");
                 File scssFile = new File(scssPath);
                 if (scssFile.exists()) {
-                    ScssStylesheet scss = ScssStylesheet.get(new File(cssPath));
+                    ScssStylesheet scss = ScssStylesheet.get(cssPath);
                     try {
                         scss.compile();
                     } catch (Exception e) {
diff --git a/sass/src/com/vaadin/sass/ScssStylesheet.java b/sass/src/com/vaadin/sass/ScssStylesheet.java
index b5e744afc4..caef1720b1 100644
--- a/sass/src/com/vaadin/sass/ScssStylesheet.java
+++ b/sass/src/com/vaadin/sass/ScssStylesheet.java
@@ -19,13 +19,17 @@ package com.vaadin.sass;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.w3c.css.sac.CSSException;
+import org.w3c.css.sac.InputSource;
 
 import com.vaadin.sass.handler.SCSSDocumentHandler;
 import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
 import com.vaadin.sass.parser.Parser;
+import com.vaadin.sass.resolver.ScssStylesheetResolver;
+import com.vaadin.sass.resolver.VaadinResolver;
 import com.vaadin.sass.tree.Node;
 import com.vaadin.sass.visitor.BlockVisitor;
 import com.vaadin.sass.visitor.ExtendVisitor;
@@ -60,15 +64,49 @@ public class ScssStylesheet extends Node {
      * @throws CSSException
      * @throws IOException
      */
-    public static ScssStylesheet get(File file) throws CSSException,
+    public static ScssStylesheet get(String identifier) throws CSSException,
             IOException {
-        Parser parser = new Parser();
-        SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl();
+        File file = new File(identifier);
         file = file.getCanonicalFile();
-        handler.getStyleSheet().setFileName(file.getAbsoluteFile().getParent());
+
+        SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl();
+        ScssStylesheet stylesheet = handler.getStyleSheet();
+
+        InputSource source = stylesheet.resolveStylesheet(identifier);
+        if (source == null) {
+            return null;
+        }
+
+        Parser parser = new Parser();
         parser.setDocumentHandler(handler);
-        parser.parseStyleSheet(file.getAbsolutePath());
-        return handler.getStyleSheet();
+        parser.parseStyleSheet(source);
+
+        return stylesheet;
+    }
+
+    private static ScssStylesheetResolver[] resolvers = null;
+
+    public static void setStylesheetResolvers(
+            ScssStylesheetResolver... styleSheetResolvers) {
+        resolvers = Arrays.copyOf(styleSheetResolvers,
+                styleSheetResolvers.length);
+    }
+
+    public InputSource resolveStylesheet(String identifier) {
+        if (resolvers == null) {
+            setStylesheetResolvers(new VaadinResolver());
+        }
+
+        for (ScssStylesheetResolver resolver : resolvers) {
+            InputSource source = resolver.resolve(identifier);
+            if (source != null) {
+                File f = new File(source.getURI());
+                setFileName(f.getParent());
+                return source;
+            }
+        }
+
+        return null;
     }
 
     /**
diff --git a/sass/src/com/vaadin/sass/parser/LexicalUnitImpl.java b/sass/src/com/vaadin/sass/parser/LexicalUnitImpl.java
index e268da8ed5..a6b03a864c 100644
--- a/sass/src/com/vaadin/sass/parser/LexicalUnitImpl.java
+++ b/sass/src/com/vaadin/sass/parser/LexicalUnitImpl.java
@@ -357,7 +357,7 @@ public class LexicalUnitImpl implements LexicalUnit, SCSSLexicalUnit,
         dimension = another.getDimension();
         sdimension = another.getSdimension();
         s = another.getStringValue();
-        fname = getFunctionName();
+        fname = another.getFunctionName();
         params = another.getParameters();
         prev = another.getPreviousLexicalUnit();
         LexicalUnit finalNextInAnother = another;
diff --git a/sass/src/com/vaadin/sass/parser/LocatorImpl.java b/sass/src/com/vaadin/sass/parser/LocatorImpl.java
index 77e7543061..d481459f17 100644
--- a/sass/src/com/vaadin/sass/parser/LocatorImpl.java
+++ b/sass/src/com/vaadin/sass/parser/LocatorImpl.java
@@ -12,119 +12,117 @@ import org.w3c.css.sac.Locator;
 
 /**
  * @version $Revision: 1.2 $
- * @author  Philippe Le Hegaret
+ * @author Philippe Le Hegaret
  */
 public class LocatorImpl implements Locator {
 
     // W3C DEBUG mode
     private static boolean W3CDebug;
     static {
-	try {
-	    W3CDebug = (Boolean.getBoolean("debug")
-			|| Boolean.getBoolean("org.w3c.flute.parser.LocatorImpl.debug")
-			|| Boolean.getBoolean("org.w3c.flute.parser.debug")
-			|| Boolean.getBoolean("org.w3c.flute.debug")
-			|| Boolean.getBoolean("org.w3c.debug")
-			|| Boolean.getBoolean("org.debug"));
-	} catch (Exception e) {
-	    // nothing
-	}
+        try {
+            W3CDebug = (Boolean.getBoolean("debug")
+                    || Boolean
+                            .getBoolean("org.w3c.flute.parser.LocatorImpl.debug")
+                    || Boolean.getBoolean("org.w3c.flute.parser.debug")
+                    || Boolean.getBoolean("org.w3c.flute.debug")
+                    || Boolean.getBoolean("org.w3c.debug") || Boolean
+                    .getBoolean("org.debug"));
+        } catch (Exception e) {
+            // nothing
+        }
     }
-    
+
     String uri;
-    int    line;
-    int    column;
+    int line;
+    int column;
 
     public String getURI() {
-	return uri;
+        return uri;
     }
 
     public int getLineNumber() {
-	return line;
+        return line;
     }
 
     public int getColumnNumber() {
-	return column;
+        return column;
     }
 
     /**
      * Creates a new LocatorImpl
      */
     public LocatorImpl(Parser p) {
-	if (W3CDebug) {
-	    System.err.println( "LocatorImpl::newLocator(" + p + ");");
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::newLocator(" + p + ");");
+        }
         uri = p.source.getURI();
-	line = p.token.beginLine;
-	column = p.token.beginColumn;
+        line = p.token.beginLine;
+        column = p.token.beginColumn;
     }
-    
+
     /**
      * Reinitializes a LocatorImpl
      */
     public LocatorImpl(Parser p, Token tok) {
-	if (W3CDebug) {
-	    System.err.println( "LocatorImpl::newLocator(" + p 
-				+ ", " + tok + ");");
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::newLocator(" + p + ", " + tok
+                    + ");");
+        }
         uri = p.source.getURI();
-	line = tok.beginLine;
-	column = tok.beginColumn;
+        line = tok.beginLine;
+        column = tok.beginColumn;
     }
-    
+
     /**
      * Reinitializes a LocatorImpl
      */
     public LocatorImpl(Parser p, int line, int column) {
-	if (W3CDebug) {
-	    System.err.println( "LocatorImpl::newLocator(" + p 
-				+ ", " + line 
-				 + ", " + column + ");");
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::newLocator(" + p + ", " + line
+                    + ", " + column + ");");
+        }
         uri = p.source.getURI();
-	this.line = line;
-	this.column = column;
+        this.line = line;
+        this.column = column;
     }
-    
+
     /**
      * Reinitializes a LocatorImpl
      */
     public LocatorImpl reInit(Parser p) {
-	if (W3CDebug) {
-	    System.err.println( "LocatorImpl::reInit(" + p + ");" );
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::reInit(" + p + ");");
+        }
         uri = p.source.getURI();
-	line = p.token.beginLine;
-	column = p.token.beginColumn;
-	return this;
+        line = p.token.beginLine;
+        column = p.token.beginColumn;
+        return this;
     }
-    
+
     /**
      * Reinitializes a LocatorImpl
      */
     public LocatorImpl reInit(Parser p, Token tok) {
-	if (W3CDebug) {
-	    System.err.println( "LocatorImpl::reInit(" + p 
-				+ ", " + tok + ");");
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::reInit(" + p + ", " + tok + ");");
+        }
         uri = p.source.getURI();
-	line = tok.beginLine;
-	column = tok.beginColumn;
-	return this;
+        line = tok.beginLine;
+        column = tok.beginColumn;
+        return this;
     }
-    
+
     /**
      * Reinitializes a LocatorImpl
      */
     public LocatorImpl reInit(Parser p, int line, int column) {
-	if (W3CDebug) {
-	    System.err.println("LocatorImpl::reInit(" + p 
-			       + ", " + line 
-			       + ", " + column + ");");
-	}
+        if (W3CDebug) {
+            System.err.println("LocatorImpl::reInit(" + p + ", " + line + ", "
+                    + column + ");");
+        }
         uri = p.source.getURI();
-	this.line = line;
-	this.column = column;
-	return this;
+        this.line = line;
+        this.column = column;
+        return this;
     }
 }
diff --git a/sass/src/com/vaadin/sass/resolver/ClassloaderResolver.java b/sass/src/com/vaadin/sass/resolver/ClassloaderResolver.java
new file mode 100644
index 0000000000..84ac6dc530
--- /dev/null
+++ b/sass/src/com/vaadin/sass/resolver/ClassloaderResolver.java
@@ -0,0 +1,39 @@
+package com.vaadin.sass.resolver;
+
+import java.io.InputStream;
+
+import org.w3c.css.sac.InputSource;
+
+public class ClassloaderResolver implements ScssStylesheetResolver {
+
+    @Override
+    public InputSource resolve(String identifier) {
+        // identifier should not have .scss, fileName should
+        String ext = ".scss";
+        if (identifier.endsWith(".css")) {
+            ext = ".css";
+        }
+        String fileName = identifier;
+        if (identifier.endsWith(ext)) {
+            identifier = identifier.substring(0,
+                    identifier.length() - ext.length());
+        } else {
+            fileName = fileName + ext;
+        }
+
+        // Can the classloader find it?
+        InputStream is = getClass().getClassLoader().getResourceAsStream(
+                fileName);
+        if (is != null) {
+            InputSource source = new InputSource();
+            source.setByteStream(is);
+            source.setURI(fileName);
+            return source;
+
+        } else {
+            return null;
+        }
+
+    }
+
+}
diff --git a/sass/src/com/vaadin/sass/resolver/FilesystemResolver.java b/sass/src/com/vaadin/sass/resolver/FilesystemResolver.java
new file mode 100644
index 0000000000..2c6b92430f
--- /dev/null
+++ b/sass/src/com/vaadin/sass/resolver/FilesystemResolver.java
@@ -0,0 +1,40 @@
+package com.vaadin.sass.resolver;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+import org.w3c.css.sac.InputSource;
+
+public class FilesystemResolver implements ScssStylesheetResolver {
+
+    @Override
+    public InputSource resolve(String identifier) {
+        // identifier should not have .scss, fileName should
+        String ext = ".scss";
+        if (identifier.endsWith(".css")) {
+            ext = ".css";
+        }
+        String fileName = identifier;
+        if (identifier.endsWith(ext)) {
+            identifier = identifier.substring(0,
+                    identifier.length() - ext.length());
+        } else {
+            fileName = fileName + ext;
+        }
+
+        try {
+            InputStream is = new FileInputStream(fileName);
+            InputSource source = new InputSource();
+            source.setByteStream(is);
+            source.setURI(fileName);
+            return source;
+
+        } catch (FileNotFoundException e) {
+            // not found, try something else
+            return null;
+        }
+
+    }
+
+}
diff --git a/sass/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java b/sass/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java
new file mode 100644
index 0000000000..c3b0e75979
--- /dev/null
+++ b/sass/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java
@@ -0,0 +1,19 @@
+package com.vaadin.sass.resolver;
+
+import org.w3c.css.sac.InputSource;
+
+public interface ScssStylesheetResolver {
+    /**
+     * Called with the "identifier" of a stylesheet that the resolver should try
+     * to find. The identifier is basically a filename, like "runo.scss" or
+     * "addon/styles.scss", but might exclude ".scss". The resolver must
+     * {@link InputSource#setURI(String)} to the final location where the
+     * stylesheet was found, e.g "runo.scss" might result in a URI like
+     * "VAADIN/themes/runo/runo.scss".
+     * 
+     * @param identifier
+     *            used fo find stylesheet
+     * @return InputSource for stylesheet (with URI set) or null if not found
+     */
+    public InputSource resolve(String identifier);
+}
\ No newline at end of file
diff --git a/sass/src/com/vaadin/sass/resolver/VaadinResolver.java b/sass/src/com/vaadin/sass/resolver/VaadinResolver.java
new file mode 100644
index 0000000000..93fdf6bfec
--- /dev/null
+++ b/sass/src/com/vaadin/sass/resolver/VaadinResolver.java
@@ -0,0 +1,46 @@
+package com.vaadin.sass.resolver;
+
+import org.w3c.css.sac.InputSource;
+
+public class VaadinResolver implements ScssStylesheetResolver {
+
+    @Override
+    public InputSource resolve(String identifier) {
+        String ext = ".scss";
+        if (identifier.endsWith(".css")) {
+            ext = ".css";
+        }
+
+        // 'normalize' identifier to use in themeFile
+        String fileName = identifier;
+        if (identifier.endsWith(ext)) {
+            identifier = identifier.substring(0,
+                    identifier.length() - ext.length());
+        }
+        // also look here
+        String themeFile = "VAADIN/themes/" + identifier + "/" + fileName;
+
+        // first plain file
+        ScssStylesheetResolver resolver = new FilesystemResolver();
+        InputSource source = resolver.resolve(fileName);
+
+        if (source == null) {
+            // then file in theme
+            source = resolver.resolve(themeFile);
+        }
+
+        if (source == null) {
+            // then plain via classloader
+            resolver = new ClassloaderResolver();
+            source = resolver.resolve(identifier);
+
+        }
+        if (source == null) {
+            // then try theme via classloader
+            source = resolver.resolve(themeFile);
+        }
+
+        return source;
+    }
+
+}
diff --git a/sass/src/com/vaadin/sass/tree/BlockNode.java b/sass/src/com/vaadin/sass/tree/BlockNode.java
index 2879cd57ea..e255b2a3e5 100644
--- a/sass/src/com/vaadin/sass/tree/BlockNode.java
+++ b/sass/src/com/vaadin/sass/tree/BlockNode.java
@@ -20,8 +20,10 @@ import org.w3c.css.sac.SelectorList;
 
 import com.vaadin.sass.parser.SelectorListImpl;
 import com.vaadin.sass.selector.SelectorUtil;
+import com.vaadin.sass.util.Clonable;
+import com.vaadin.sass.util.DeepCopy;
 
-public class BlockNode extends Node {
+public class BlockNode extends Node implements Clonable {
 
     private static final long serialVersionUID = 5742962631468325048L;
 
@@ -62,12 +64,21 @@ public class BlockNode extends Node {
     }
 
     @Override
-    protected Object clone() throws CloneNotSupportedException {
-        SelectorListImpl clonedSelectorList = new SelectorListImpl();
-        for (int i = 0; i < selectorList.getLength(); i++) {
-            clonedSelectorList.addSelector(selectorList.item(i));
+    public Object clone() throws CloneNotSupportedException {
+
+        SelectorListImpl clonedSelectorList = null;
+
+        if (selectorList != null) {
+            clonedSelectorList = new SelectorListImpl();
+            for (int i = 0; i < selectorList.getLength(); i++) {
+                clonedSelectorList.addSelector(selectorList.item(i));
+            }
         }
-        return null;
-        // BlockNode clone = new BlockNode()
+        final BlockNode clone = new BlockNode(clonedSelectorList);
+        for (Node child : getChildren()) {
+            clone.getChildren().add((Node) DeepCopy.copy(child));
+        }
+        return clone;
     }
+
 }
diff --git a/sass/src/com/vaadin/sass/util/Clonable.java b/sass/src/com/vaadin/sass/util/Clonable.java
new file mode 100644
index 0000000000..639f158fb0
--- /dev/null
+++ b/sass/src/com/vaadin/sass/util/Clonable.java
@@ -0,0 +1,7 @@
+package com.vaadin.sass.util;
+
+public interface Clonable {
+
+    public Object clone() throws CloneNotSupportedException;
+
+}
diff --git a/sass/src/com/vaadin/sass/util/DeepCopy.java b/sass/src/com/vaadin/sass/util/DeepCopy.java
index 712b8ecc11..5d4e43c477 100644
--- a/sass/src/com/vaadin/sass/util/DeepCopy.java
+++ b/sass/src/com/vaadin/sass/util/DeepCopy.java
@@ -35,26 +35,39 @@ public class DeepCopy {
      * Returns a copy of the object, or null if the object cannot be serialized.
      */
     public static Object copy(Object orig) {
+
         Object obj = null;
-        try {
-            // Write the object out to a byte array
-            FastByteArrayOutputStream fbos = new FastByteArrayOutputStream();
-            ObjectOutputStream out = new ObjectOutputStream(fbos);
-            out.writeObject(orig);
-            out.flush();
-            out.close();
+        if (!(orig instanceof Clonable)) {
+            try {
+                // Write the object out to a byte array
+                FastByteArrayOutputStream fbos = new FastByteArrayOutputStream();
+                ObjectOutputStream out = new ObjectOutputStream(fbos);
+                out.writeObject(orig);
+                out.flush();
+                out.close();
 
-            // Retrieve an input stream from the byte array and read
-            // a copy of the object back in.
-            ObjectInputStream in = new ObjectInputStream(fbos.getInputStream());
-            obj = in.readObject();
-            in.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (ClassNotFoundException cnfe) {
-            cnfe.printStackTrace();
+                // Retrieve an input stream from the byte array and read
+                // a copy of the object back in.
+                ObjectInputStream in = new ObjectInputStream(
+                        fbos.getInputStream());
+                obj = in.readObject();
+                in.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            } catch (ClassNotFoundException cnfe) {
+                cnfe.printStackTrace();
+            }
+            return obj;
+        } else {
+            try {
+                obj = ((Clonable) orig).clone();
+            } catch (ClassCastException e2) {
+                // Can't clone, return obj as null
+            } catch (CloneNotSupportedException e2) {
+                // Can't clone, return obj as null
+            }
+            return obj;
         }
-        return obj;
     }
 
 }
\ No newline at end of file
diff --git a/sass/src/com/vaadin/sass/visitor/ImportVisitor.java b/sass/src/com/vaadin/sass/visitor/ImportVisitor.java
index 00c0f41073..bda040be39 100644
--- a/sass/src/com/vaadin/sass/visitor/ImportVisitor.java
+++ b/sass/src/com/vaadin/sass/visitor/ImportVisitor.java
@@ -17,6 +17,7 @@
 package com.vaadin.sass.visitor;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 
@@ -38,16 +39,27 @@ public class ImportVisitor implements Visitor {
             if (child instanceof ImportNode) {
                 ImportNode importNode = (ImportNode) child;
                 if (!importNode.isPureCssImport()) {
-                    StringBuilder filePathBuilder = new StringBuilder(
-                            node.getFileName());
-                    filePathBuilder.append(File.separatorChar).append(
-                            importNode.getUri());
-                    if (!filePathBuilder.toString().endsWith(".scss")) {
-                        filePathBuilder.append(".scss");
-                    }
+
                     try {
-                        ScssStylesheet imported = ScssStylesheet.get(new File(
-                                filePathBuilder.toString()));
+
+                        StringBuilder filePathBuilder = new StringBuilder(
+                                node.getFileName());
+                        filePathBuilder.append(File.separatorChar).append(
+                                importNode.getUri());
+                        if (!filePathBuilder.toString().endsWith(".scss")) {
+                            filePathBuilder.append(".scss");
+                        }
+
+                        ScssStylesheet imported = ScssStylesheet
+                                .get(filePathBuilder.toString());
+                        if (imported == null) {
+                            imported = ScssStylesheet.get(importNode.getUri());
+                        }
+                        if (imported == null) {
+                            throw new FileNotFoundException(importNode.getUri()
+                                    + " (parent: " + node.getFileName() + ")");
+                        }
+
                         traverse(imported);
                         String prefix = getUrlPrefix(importNode.getUri());
                         if (prefix != null) {
diff --git a/sass/src/com/vaadin/sass/visitor/VariableVisitor.java b/sass/src/com/vaadin/sass/visitor/VariableVisitor.java
index e8fb2fccc3..7fa62bd20f 100644
--- a/sass/src/com/vaadin/sass/visitor/VariableVisitor.java
+++ b/sass/src/com/vaadin/sass/visitor/VariableVisitor.java
@@ -40,13 +40,20 @@ public class VariableVisitor implements Visitor {
     private void traverse(Node node, Map<String, LexicalUnitImpl> variables) {
         if (node instanceof RuleNode) {
             LexicalUnit value = ((RuleNode) node).getValue();
-            updateValue(value, variables);
+            while (updateValue(value, variables)) {
+                ;
+            }
         } else {
             Set<Node> toBeDeleted = new HashSet<Node>();
             for (Node child : node.getChildren()) {
                 if (child instanceof VariableNode) {
-                    variables.put(((VariableNode) child).getName(),
-                            (LexicalUnitImpl) ((VariableNode) child).getExpr());
+                    VariableNode varChild = (VariableNode) child;
+                    if (!varChild.isGuarded() || varChild.isGuarded()
+                            && variables.get(varChild.getName()) == null) {
+                        variables.put(((VariableNode) child).getName(),
+                                (LexicalUnitImpl) ((VariableNode) child)
+                                        .getExpr());
+                    }
                     toBeDeleted.add(child);
                 } else {
                     traverse(child, new HashMap<String, LexicalUnitImpl>(
@@ -59,17 +66,22 @@ public class VariableVisitor implements Visitor {
         }
     }
 
-    private void updateValue(LexicalUnit value,
+    private boolean updateValue(LexicalUnit value,
             Map<String, LexicalUnitImpl> variables) {
+        boolean onceMore = false;
         if (value == null) {
-            return;
+            return false;
         }
         if (value.getLexicalUnitType() == SCSSLexicalUnit.SCSS_VARIABLE) {
-            LexicalUnitImpl variableValue = variables.get(
-                    value.getStringValue()).clone();
+            LexicalUnitImpl variableValue = variables.get(value
+                    .getStringValue());
             if (variableValue != null) {
-                LexicalUnitImpl lexVal = (LexicalUnitImpl) value;
-                lexVal.replaceValue(variableValue);
+                LexicalUnitImpl variableValueCloned = variableValue.clone();
+                if (variableValueCloned != null) {
+                    LexicalUnitImpl lexVal = (LexicalUnitImpl) value;
+                    lexVal.replaceValue(variableValueCloned);
+                    onceMore = true;
+                }
             }
         } else if (value.getLexicalUnitType() == SCSSLexicalUnit.SAC_FUNCTION) {
             LexicalUnit params = value.getParameters();
@@ -77,5 +89,6 @@ public class VariableVisitor implements Visitor {
         }
         LexicalUnit next = value.getNextLexicalUnit();
         updateValue(next, variables);
+        return onceMore;
     }
 }
diff --git a/tests/sass/resources/basic/empty_block.css b/sass/tests/resources/basic/empty_block.css
index 31c0b47032..31c0b47032 100644
--- a/tests/sass/resources/basic/empty_block.css
+++ b/sass/tests/resources/basic/empty_block.css
diff --git a/tests/sass/resources/basic/media.css b/sass/tests/resources/basic/media.css
index f1188835ba..f1188835ba 100644
--- a/tests/sass/resources/basic/media.css
+++ b/sass/tests/resources/basic/media.css
diff --git a/tests/sass/resources/basic/properties.css b/sass/tests/resources/basic/properties.css
index 946ee3a675..946ee3a675 100644
--- a/tests/sass/resources/basic/properties.css
+++ b/sass/tests/resources/basic/properties.css
diff --git a/tests/sass/resources/basic/reindeer.css b/sass/tests/resources/basic/reindeer.css
index 4f1cd47193..4f1cd47193 100644
--- a/tests/sass/resources/basic/reindeer.css
+++ b/sass/tests/resources/basic/reindeer.css
diff --git a/tests/sass/resources/basic/selectors.css b/sass/tests/resources/basic/selectors.css
index 50c5fb7cc5..50c5fb7cc5 100644
--- a/tests/sass/resources/basic/selectors.css
+++ b/sass/tests/resources/basic/selectors.css
diff --git a/tests/sass/resources/css/comments.css b/sass/tests/resources/css/comments.css
index 1c773f7974..1c773f7974 100644
--- a/tests/sass/resources/css/comments.css
+++ b/sass/tests/resources/css/comments.css
diff --git a/tests/sass/resources/css/control-directives.scss b/sass/tests/resources/css/control-directives.css
index 0a6f1f7233..0a6f1f7233 100644
--- a/tests/sass/resources/css/control-directives.scss
+++ b/sass/tests/resources/css/control-directives.css
diff --git a/tests/sass/resources/css/extends.css b/sass/tests/resources/css/extends.css
index d1c903f166..d1c903f166 100644
--- a/tests/sass/resources/css/extends.css
+++ b/sass/tests/resources/css/extends.css
diff --git a/tests/sass/resources/css/functions.css b/sass/tests/resources/css/functions.css
index de87462b46..de87462b46 100644
--- a/tests/sass/resources/css/functions.css
+++ b/sass/tests/resources/css/functions.css
diff --git a/tests/sass/resources/css/imports.css b/sass/tests/resources/css/imports.css
index 5b1001802a..5b1001802a 100644
--- a/tests/sass/resources/css/imports.css
+++ b/sass/tests/resources/css/imports.css
diff --git a/tests/sass/resources/css/microsoft-extensions.css b/sass/tests/resources/css/microsoft-extensions.css
index 69670969de..69670969de 100644
--- a/tests/sass/resources/css/microsoft-extensions.css
+++ b/sass/tests/resources/css/microsoft-extensions.css
diff --git a/tests/sass/resources/css/mixins.css b/sass/tests/resources/css/mixins.css
index cd5c9b85aa..5c727c193b 100644
--- a/tests/sass/resources/css/mixins.css
+++ b/sass/tests/resources/css/mixins.css
@@ -8,6 +8,11 @@
 	font-weight: bold;
 }
 
+.main .details {
+	font-size: 14px;
+	font-weight: bold;
+}
+
 .footer {
 	border: 2px solid black;
 	-webkit-border-radius: 10px;
diff --git a/tests/sass/resources/css/nested-properties.css b/sass/tests/resources/css/nested-properties.css
index 79b21e632b..79b21e632b 100644
--- a/tests/sass/resources/css/nested-properties.css
+++ b/sass/tests/resources/css/nested-properties.css
diff --git a/tests/sass/resources/css/nesting.css b/sass/tests/resources/css/nesting.css
index 2400c73d43..2400c73d43 100644
--- a/tests/sass/resources/css/nesting.css
+++ b/sass/tests/resources/css/nesting.css
diff --git a/tests/sass/resources/css/parent-import.css b/sass/tests/resources/css/parent-import.css
index f67d17f8b4..f67d17f8b4 100644
--- a/tests/sass/resources/css/parent-import.css
+++ b/sass/tests/resources/css/parent-import.css
diff --git a/tests/sass/resources/css/parent-selector.css b/sass/tests/resources/css/parent-selector.css
index 9c7140e313..9c7140e313 100644
--- a/tests/sass/resources/css/parent-selector.css
+++ b/sass/tests/resources/css/parent-selector.css
diff --git a/tests/sass/resources/css/semicolons.css b/sass/tests/resources/css/semicolons.css
index 8a08617638..8a08617638 100644
--- a/tests/sass/resources/css/semicolons.css
+++ b/sass/tests/resources/css/semicolons.css
diff --git a/sass/tests/resources/css/var-guarded.css b/sass/tests/resources/css/var-guarded.css
new file mode 100644
index 0000000000..c4a8c49d12
--- /dev/null
+++ b/sass/tests/resources/css/var-guarded.css
@@ -0,0 +1,4 @@
+#main {
+	content: "First content";
+	new-content: "First time reference";
+}
\ No newline at end of file
diff --git a/tests/sass/resources/css/variables.css b/sass/tests/resources/css/variables.css
index d54ae6cd30..d54ae6cd30 100644
--- a/tests/sass/resources/css/variables.css
+++ b/sass/tests/resources/css/variables.css
diff --git a/tests/sass/resources/scss/_partial-for-import.scss b/sass/tests/resources/scss/_partial-for-import.scss
index 32c3149a5b..32c3149a5b 100644
--- a/tests/sass/resources/scss/_partial-for-import.scss
+++ b/sass/tests/resources/scss/_partial-for-import.scss
diff --git a/tests/sass/resources/scss/comments.scss b/sass/tests/resources/scss/comments.scss
index de3fbe8e0d..de3fbe8e0d 100644
--- a/tests/sass/resources/scss/comments.scss
+++ b/sass/tests/resources/scss/comments.scss
diff --git a/tests/sass/resources/scss/control-directives.scss b/sass/tests/resources/scss/control-directives.scss
index febd563f19..febd563f19 100644
--- a/tests/sass/resources/scss/control-directives.scss
+++ b/sass/tests/resources/scss/control-directives.scss
diff --git a/tests/sass/resources/scss/extends.scss b/sass/tests/resources/scss/extends.scss
index c9e0f85381..c9e0f85381 100644
--- a/tests/sass/resources/scss/extends.scss
+++ b/sass/tests/resources/scss/extends.scss
diff --git a/tests/sass/resources/scss/folder-test/parent-import.scss b/sass/tests/resources/scss/folder-test/parent-import.scss
index b3f6c8000e..b3f6c8000e 100644
--- a/tests/sass/resources/scss/folder-test/parent-import.scss
+++ b/sass/tests/resources/scss/folder-test/parent-import.scss
diff --git a/tests/sass/resources/scss/folder-test2/base-imported.scss b/sass/tests/resources/scss/folder-test2/base-imported.scss
index 17d801e4aa..17d801e4aa 100644
--- a/tests/sass/resources/scss/folder-test2/base-imported.scss
+++ b/sass/tests/resources/scss/folder-test2/base-imported.scss
diff --git a/tests/sass/resources/scss/folder-test2/base.scss b/sass/tests/resources/scss/folder-test2/base.scss
index 57ca0bb7a2..57ca0bb7a2 100644
--- a/tests/sass/resources/scss/folder-test2/base.scss
+++ b/sass/tests/resources/scss/folder-test2/base.scss
diff --git a/tests/sass/resources/scss/folder-test2/url.scss b/sass/tests/resources/scss/folder-test2/url.scss
index a4be967ad7..a4be967ad7 100644
--- a/tests/sass/resources/scss/folder-test2/url.scss
+++ b/sass/tests/resources/scss/folder-test2/url.scss
diff --git a/tests/sass/resources/scss/folder-test2/variables.scss b/sass/tests/resources/scss/folder-test2/variables.scss
index 2d06d36650..2d06d36650 100644
--- a/tests/sass/resources/scss/folder-test2/variables.scss
+++ b/sass/tests/resources/scss/folder-test2/variables.scss
diff --git a/tests/sass/resources/scss/functions.scss b/sass/tests/resources/scss/functions.scss
index abf6f6187d..abf6f6187d 100644
--- a/tests/sass/resources/scss/functions.scss
+++ b/sass/tests/resources/scss/functions.scss
diff --git a/tests/sass/resources/scss/imports.scss b/sass/tests/resources/scss/imports.scss
index 4d53a120d2..4d53a120d2 100644
--- a/tests/sass/resources/scss/imports.scss
+++ b/sass/tests/resources/scss/imports.scss
diff --git a/tests/sass/resources/scss/interpolation.scss b/sass/tests/resources/scss/interpolation.scss
index 5859a9838b..5859a9838b 100644
--- a/tests/sass/resources/scss/interpolation.scss
+++ b/sass/tests/resources/scss/interpolation.scss
diff --git a/tests/sass/resources/scss/microsoft-extensions.scss b/sass/tests/resources/scss/microsoft-extensions.scss
index 69670969de..69670969de 100644
--- a/tests/sass/resources/scss/microsoft-extensions.scss
+++ b/sass/tests/resources/scss/microsoft-extensions.scss
diff --git a/tests/sass/resources/scss/mixins.scss b/sass/tests/resources/scss/mixins.scss
index f16c9a0e06..52e03d62c1 100644
--- a/tests/sass/resources/scss/mixins.scss
+++ b/sass/tests/resources/scss/mixins.scss
@@ -16,6 +16,7 @@
 .main {
 	@include rounded-borders(1px);
 	@include font-settings;
+	@include main-details(14px);
 }
 
 .footer {
@@ -41,4 +42,14 @@
 	}
 	@include font-settings;
 }
+
+@mixin main-details($size){
+	.details {
+		font: {
+			size : $size;
+			weight: bold;
+		}
+	}
+}
+
 @include layout;
\ No newline at end of file
diff --git a/tests/sass/resources/scss/nested-properties.scss b/sass/tests/resources/scss/nested-properties.scss
index e12a83aa2d..e12a83aa2d 100644
--- a/tests/sass/resources/scss/nested-properties.scss
+++ b/sass/tests/resources/scss/nested-properties.scss
diff --git a/tests/sass/resources/scss/nesting.scss b/sass/tests/resources/scss/nesting.scss
index 0336c9e86d..0336c9e86d 100644
--- a/tests/sass/resources/scss/nesting.scss
+++ b/sass/tests/resources/scss/nesting.scss
diff --git a/tests/sass/resources/scss/parent-selector.scss b/sass/tests/resources/scss/parent-selector.scss
index 3d0f694801..3d0f694801 100644
--- a/tests/sass/resources/scss/parent-selector.scss
+++ b/sass/tests/resources/scss/parent-selector.scss
diff --git a/tests/sass/resources/scss/reference-parent-selector.css b/sass/tests/resources/scss/reference-parent-selector.css
index 733c8fd42d..733c8fd42d 100644
--- a/tests/sass/resources/scss/reference-parent-selector.css
+++ b/sass/tests/resources/scss/reference-parent-selector.css
diff --git a/tests/sass/resources/scss/semicolons.scss b/sass/tests/resources/scss/semicolons.scss
index a4a56043d5..a4a56043d5 100644
--- a/tests/sass/resources/scss/semicolons.scss
+++ b/sass/tests/resources/scss/semicolons.scss
diff --git a/sass/tests/resources/scss/var-guarded.scss b/sass/tests/resources/scss/var-guarded.scss
new file mode 100644
index 0000000000..8f7aab8fa9
--- /dev/null
+++ b/sass/tests/resources/scss/var-guarded.scss
@@ -0,0 +1,8 @@
+$content: "First content";
+$content: "Second content?" !default;
+$new_content: "First time reference" !default;
+
+#main {
+  content: $content;
+  new-content: $new_content;
+}
\ No newline at end of file
diff --git a/tests/sass/resources/scss/variables.scss b/sass/tests/resources/scss/variables.scss
index 60acc5dd10..60acc5dd10 100644
--- a/tests/sass/resources/scss/variables.scss
+++ b/sass/tests/resources/scss/variables.scss
diff --git a/tests/sass/src/com/vaadin/sass/AbstractTestBase.java b/sass/tests/src/com/vaadin/sass/AbstractTestBase.java
index 3593a6a19c..a6b03fefb0 100644
--- a/tests/sass/src/com/vaadin/sass/AbstractTestBase.java
+++ b/sass/tests/src/com/vaadin/sass/AbstractTestBase.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.sass;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -24,6 +23,7 @@ import java.net.URISyntaxException;
 
 import junit.framework.Assert;
 
+import org.apache.commons.io.IOUtils;
 import org.w3c.css.sac.CSSException;
 
 public abstract class AbstractTestBase {
@@ -36,7 +36,7 @@ public abstract class AbstractTestBase {
     public ScssStylesheet getStyleSheet(String filename)
             throws URISyntaxException, CSSException, IOException {
         File file = getFile(filename);
-        stylesheet = ScssStylesheet.get(file);
+        stylesheet = ScssStylesheet.get(file.getAbsolutePath());
         return stylesheet;
     }
 
@@ -61,23 +61,7 @@ public abstract class AbstractTestBase {
      *             when file reading fails
      */
     public String getFileContent(File file) throws IOException {
-        StringBuilder content = new StringBuilder();
-
-        FileReader fileReader = new FileReader(file);
-        BufferedReader bufferedReader = new BufferedReader(fileReader);
-        String line = null;
-        // Handle the first line separately to get the right amount of line
-        // separators in the loop
-        if ((line = bufferedReader.readLine()) != null) {
-            content.append(line);
-        }
-        // Handle the rest of the lines
-        while ((line = bufferedReader.readLine()) != null) {
-            content.append(System.getProperty("line.separator"));
-            content.append(line);
-        }
-        bufferedReader.close();
-        return content.toString();
+        return IOUtils.toString(new FileReader(file));
     }
 
     public void testParser(String file) throws CSSException, IOException,
diff --git a/tests/sass/src/com/vaadin/sass/parser/ParserTest.java b/sass/tests/src/com/vaadin/sass/parser/ParserTest.java
index 34c365ea13..34c365ea13 100644
--- a/tests/sass/src/com/vaadin/sass/parser/ParserTest.java
+++ b/sass/tests/src/com/vaadin/sass/parser/ParserTest.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/EmptyBlock.java b/sass/tests/src/com/vaadin/sass/testcases/css/EmptyBlock.java
index de8a45b9a9..de8a45b9a9 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/css/EmptyBlock.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/css/EmptyBlock.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Interpolation.java b/sass/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
index 01d593db78..01d593db78 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/css/Interpolation.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Media.java b/sass/tests/src/com/vaadin/sass/testcases/css/Media.java
index 04b8573154..04b8573154 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/css/Media.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/css/Media.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Properties.java b/sass/tests/src/com/vaadin/sass/testcases/css/Properties.java
index e0c07bc9c0..e0c07bc9c0 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/css/Properties.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/css/Properties.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Reindeer.java b/sass/tests/src/com/vaadin/sass/testcases/css/Reindeer.java
index 9bb4ed4570..9bb4ed4570 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/css/Reindeer.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/css/Reindeer.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/css/Selectors.java b/sass/tests/src/com/vaadin/sass/testcases/css/Selectors.java
index cb865042b6..cb865042b6 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/css/Selectors.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/css/Selectors.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java b/sass/tests/src/com/vaadin/sass/testcases/scss/Comments.java
index c76bbb8458..c76bbb8458 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Comments.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/Comments.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/ControlDirectives.java b/sass/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
index 033bbb0a1f..033bbb0a1f 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Extends.java b/sass/tests/src/com/vaadin/sass/testcases/scss/Extends.java
index f52a1d2f8b..f52a1d2f8b 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Extends.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/Extends.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Functions.java b/sass/tests/src/com/vaadin/sass/testcases/scss/Functions.java
index d2e890c052..d2e890c052 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Functions.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/Functions.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Imports.java b/sass/tests/src/com/vaadin/sass/testcases/scss/Imports.java
index 8c609273a1..8c609273a1 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Imports.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/Imports.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java b/sass/tests/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java
index 5460700db4..5460700db4 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Mixins.java b/sass/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
index c801ab1437..05b3d3c83e 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Mixins.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
@@ -69,7 +69,7 @@ public class Mixins extends AbstractTestBase {
         Assert.assertEquals(4, mixinDefNode1.getChildren().size());
 
         BlockNode mainBlockNode = (BlockNode) root.getChildren().get(2);
-        Assert.assertEquals(2, mainBlockNode.getChildren().size());
+        Assert.assertEquals(3, mainBlockNode.getChildren().size());
         MixinNode mixinNode0MainBlock = (MixinNode) mainBlockNode.getChildren()
                 .get(0);
         Assert.assertEquals("rounded-borders", mixinNode0MainBlock.getName());
@@ -82,6 +82,11 @@ public class Mixins extends AbstractTestBase {
         Assert.assertEquals("font-settings", mixinNOde1MainBlock.getName());
         Assert.assertTrue(mixinNOde1MainBlock.getArglist().isEmpty());
 
+        MixinNode mixinNOde2MainBlock = (MixinNode) mainBlockNode.getChildren()
+                .get(2);
+        Assert.assertEquals("main-details", mixinNOde2MainBlock.getName());
+        Assert.assertTrue(mixinNOde1MainBlock.getArglist().isEmpty());
+
         MixinNode mixinNode1MainBlock = (MixinNode) mainBlockNode.getChildren()
                 .get(1);
         Assert.assertTrue(mixinNode1MainBlock.getArglist().isEmpty());
@@ -103,9 +108,6 @@ public class Mixins extends AbstractTestBase {
         Assert.assertTrue(root.getChildren().get(4).getChildren().get(3) instanceof MediaNode);
         Assert.assertTrue(root.getChildren().get(4).getChildren().get(4) instanceof MixinNode);
 
-        MixinNode topLevelMixin = (MixinNode) root.getChildren().get(5);
-        Assert.assertEquals("layout", topLevelMixin.getName());
-
     }
 
     @Test
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/NestedProperties.java b/sass/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
index 2f57934086..2f57934086 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/NestedProperties.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Nesting.java b/sass/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
index 55365c78e1..55365c78e1 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Nesting.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentImports.java b/sass/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
index 8b12f3b7e9..8b12f3b7e9 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentImports.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentSelector.java b/sass/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
index 7ac2450bfc..7ac2450bfc 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/ParentSelector.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Semicolons.java b/sass/tests/src/com/vaadin/sass/testcases/scss/Semicolons.java
index 9dd8a38bfe..9dd8a38bfe 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Semicolons.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/Semicolons.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java b/sass/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java
new file mode 100644
index 0000000000..2c37737e69
--- /dev/null
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java
@@ -0,0 +1,36 @@
+package com.vaadin.sass.testcases.scss;
+
+import java.io.IOException;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+import org.w3c.css.sac.CSSException;
+
+import com.vaadin.sass.AbstractTestBase;
+import com.vaadin.sass.ScssStylesheet;
+import com.vaadin.sass.handler.SCSSDocumentHandler;
+import com.vaadin.sass.handler.SCSSDocumentHandlerImpl;
+import com.vaadin.sass.parser.Parser;
+
+public class VariableGuarded extends AbstractTestBase {
+    String scss = "/scss/var-guarded.scss";
+    String css = "/css/var-guarded.css";
+
+    @Test
+    public void testParser() throws CSSException, IOException {
+        Parser parser = new Parser();
+        SCSSDocumentHandler handler = new SCSSDocumentHandlerImpl();
+        parser.setDocumentHandler(handler);
+        parser.parseStyleSheet(getClass().getResource(scss).getPath());
+        ScssStylesheet root = handler.getStyleSheet();
+        Assert.assertEquals(4, root.getChildren().size());
+    }
+
+    @Test
+    public void testCompiler() throws Exception {
+        testCompiler(scss, css);
+        Assert.assertEquals("Original CSS and parsed CSS doesn't match",
+                comparisonCss, parsedScss);
+    }
+}
diff --git a/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java b/sass/tests/src/com/vaadin/sass/testcases/scss/Variables.java
index 010a2085ba..010a2085ba 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/scss/Variables.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/scss/Variables.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java b/sass/tests/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java
index 8459139b4b..8459139b4b 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java b/sass/tests/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java
index 6b7cfcb2fb..6b7cfcb2fb 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java
diff --git a/tests/sass/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java b/sass/tests/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java
index 3885869b72..3885869b72 100644
--- a/tests/sass/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java
+++ b/sass/tests/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java
diff --git a/tests/sass/src/com/vaadin/sass/tree/ImportNodeTest.java b/sass/tests/src/com/vaadin/sass/tree/ImportNodeTest.java
index b3a1c8f318..b3a1c8f318 100644
--- a/tests/sass/src/com/vaadin/sass/tree/ImportNodeTest.java
+++ b/sass/tests/src/com/vaadin/sass/tree/ImportNodeTest.java
diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java
index bdad94355d..164f04bb79 100644
--- a/server/src/com/vaadin/Application.java
+++ b/server/src/com/vaadin/Application.java
@@ -30,7 +30,6 @@ import java.util.EventListener;
 import java.util.EventObject;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -51,27 +50,27 @@ import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.ConverterFactory;
 import com.vaadin.data.util.converter.DefaultConverterFactory;
 import com.vaadin.event.EventRouter;
+import com.vaadin.server.AbstractApplicationServlet;
+import com.vaadin.server.AbstractErrorMessage;
+import com.vaadin.server.BootstrapFragmentResponse;
+import com.vaadin.server.BootstrapListener;
+import com.vaadin.server.BootstrapPageResponse;
+import com.vaadin.server.BootstrapResponse;
+import com.vaadin.server.ChangeVariablesErrorEvent;
+import com.vaadin.server.ClientConnector;
+import com.vaadin.server.CombinedRequest;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.GlobalResourceHandler;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.Terminal;
+import com.vaadin.server.UIProvider;
+import com.vaadin.server.VariableOwner;
+import com.vaadin.server.WebApplicationContext;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedRequest.BrowserDetails;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.service.ApplicationContext;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.AbstractErrorMessage;
-import com.vaadin.terminal.ApplicationResource;
-import com.vaadin.terminal.CombinedRequest;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.Terminal;
-import com.vaadin.terminal.UIProvider;
-import com.vaadin.terminal.VariableOwner;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedRequest.BrowserDetails;
-import com.vaadin.terminal.WrappedResponse;
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
-import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse;
-import com.vaadin.terminal.gwt.server.BootstrapListener;
-import com.vaadin.terminal.gwt.server.BootstrapPageResponse;
-import com.vaadin.terminal.gwt.server.BootstrapResponse;
-import com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent;
-import com.vaadin.terminal.gwt.server.ClientConnector;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractField;
@@ -123,8 +122,8 @@ import com.vaadin.ui.Window;
  * found out, the window itself is queried for a preferred theme. If the window
  * does not prefer a specific theme, the application containing the window is
  * queried. If neither the application prefers a theme, the default theme for
- * the {@link com.vaadin.terminal.Terminal terminal} is used. The terminal
- * always defines a default theme.
+ * the {@link com.vaadin.server.Terminal terminal} is used. The terminal always
+ * defines a default theme.
  * </p>
  * 
  * @author Vaadin Ltd.
@@ -458,10 +457,6 @@ public class Application implements Terminal.ErrorListener, Serializable {
     /**
      * Application resource mapping: key <-> resource.
      */
-    private final Hashtable<ApplicationResource, String> resourceKeyMap = new Hashtable<ApplicationResource, String>();
-
-    private final Hashtable<String, ApplicationResource> keyResourceMap = new Hashtable<String, ApplicationResource>();
-
     private long lastResourceKeyNumber = 0;
 
     /**
@@ -508,6 +503,8 @@ public class Application implements Terminal.ErrorListener, Serializable {
 
     private List<UIProvider> uiProviders = new LinkedList<UIProvider>();
 
+    private GlobalResourceHandler globalResourceHandler;
+
     /**
      * Gets the user of the application.
      * 
@@ -694,71 +691,6 @@ public class Application implements Terminal.ErrorListener, Serializable {
     }
 
     /**
-     * Adds new resource to the application. The resource can be accessed by the
-     * user of the application.
-     * 
-     * @param resource
-     *            the resource to add.
-     */
-    public void addResource(ApplicationResource resource) {
-
-        // Check if the resource is already mapped
-        if (resourceKeyMap.containsKey(resource)) {
-            return;
-        }
-
-        // Generate key
-        final String key = String.valueOf(++lastResourceKeyNumber);
-
-        // Add the resource to mappings
-        resourceKeyMap.put(resource, key);
-        keyResourceMap.put(key, resource);
-    }
-
-    /**
-     * Removes the resource from the application.
-     * 
-     * @param resource
-     *            the resource to remove.
-     */
-    public void removeResource(ApplicationResource resource) {
-        final Object key = resourceKeyMap.get(resource);
-        if (key != null) {
-            resourceKeyMap.remove(resource);
-            keyResourceMap.remove(key);
-        }
-    }
-
-    /**
-     * Gets the relative uri of the resource. This method is intended to be
-     * called only be the terminal implementation.
-     * 
-     * This method can only be called from within the processing of a UIDL
-     * request, not from a background thread.
-     * 
-     * @param resource
-     *            the resource to get relative location.
-     * @return the relative uri of the resource or null if called in a
-     *         background thread
-     * 
-     * @deprecated this method is intended to be used by the terminal only. It
-     *             may be removed or moved in the future.
-     */
-    @Deprecated
-    public String getRelativeLocation(ApplicationResource resource) {
-
-        // Gets the key
-        final String key = resourceKeyMap.get(resource);
-
-        // If the resource is not registered, return null
-        if (key == null) {
-            return null;
-        }
-
-        return context.generateApplicationResourceURL(resource, key);
-    }
-
-    /**
      * Gets the default locale for this application.
      * 
      * By default this is the preferred locale of the user using the
@@ -881,7 +813,7 @@ public class Application implements Terminal.ErrorListener, Serializable {
      * @param listener
      *            the user change listener to add.
      */
-    public void addListener(UserChangeListener listener) {
+    public void addUserChangeListener(UserChangeListener listener) {
         if (userChangeListeners == null) {
             userChangeListeners = new LinkedList<UserChangeListener>();
         }
@@ -889,12 +821,22 @@ public class Application implements Terminal.ErrorListener, Serializable {
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addUserChangeListener(UserChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(UserChangeListener listener) {
+        addUserChangeListener(listener);
+    }
+
+    /**
      * Removes the user change listener.
      * 
      * @param listener
      *            the user change listener to remove.
      */
-    public void removeListener(UserChangeListener listener) {
+
+    public void removeUserChangeListener(UserChangeListener listener) {
         if (userChangeListeners == null) {
             return;
         }
@@ -905,6 +847,15 @@ public class Application implements Terminal.ErrorListener, Serializable {
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeUserChangeListener(UserChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(UserChangeListener listener) {
+        removeUserChangeListener(listener);
+    }
+
+    /**
      * Window detach event.
      * 
      * This event is sent each time a window is removed from the application
@@ -1075,7 +1026,7 @@ public class Application implements Terminal.ErrorListener, Serializable {
      * 
      * @param event
      *            the change event.
-     * @see com.vaadin.terminal.Terminal.ErrorListener#terminalError(com.vaadin.terminal.Terminal.ErrorEvent)
+     * @see com.vaadin.server.Terminal.ErrorListener#terminalError(com.vaadin.server.Terminal.ErrorEvent)
      */
 
     @Override
@@ -2066,20 +2017,6 @@ public class Application implements Terminal.ErrorListener, Serializable {
     }
 
     /**
-     * Find an application resource with a given key.
-     * 
-     * @param key
-     *            The key of the resource
-     * @return The application resource corresponding to the provided key, or
-     *         <code>null</code> if no resource is registered for the key
-     * 
-     * @since 7.0
-     */
-    public ApplicationResource getResource(String key) {
-        return keyResourceMap.get(key);
-    }
-
-    /**
      * Thread local for keeping track of currently used application instance
      * 
      * @since 7.0
@@ -2510,4 +2447,30 @@ public class Application implements Terminal.ErrorListener, Serializable {
         }
         return true;
     }
+
+    /**
+     * Gets this application's global resource handler that takes care of
+     * serving connector resources that are not served by any single connector
+     * because e.g. because they are served with strong caching or because of
+     * legacy reasons.
+     * 
+     * @param createOnDemand
+     *            <code>true</code> if a resource handler should be initialized
+     *            if there is no handler associated with this application.
+     *            </code>false</code> if </code>null</code> should be returned
+     *            if there is no registered handler.
+     * @return this application's global resource handler, or <code>null</code>
+     *         if there is no handler and the createOnDemand parameter is
+     *         <code>false</code>.
+     * 
+     * @since 7.0.0
+     */
+    public GlobalResourceHandler getGlobalResourceHandler(boolean createOnDemand) {
+        if (globalResourceHandler == null && createOnDemand) {
+            globalResourceHandler = new GlobalResourceHandler();
+            addRequestHandler(globalResourceHandler);
+        }
+
+        return globalResourceHandler;
+    }
 }
diff --git a/server/src/com/vaadin/UIRequiresMoreInformationException.java b/server/src/com/vaadin/UIRequiresMoreInformationException.java
index 493c31acb6..76a31d88ef 100644
--- a/server/src/com/vaadin/UIRequiresMoreInformationException.java
+++ b/server/src/com/vaadin/UIRequiresMoreInformationException.java
@@ -16,8 +16,8 @@
 
 package com.vaadin;
 
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedRequest.BrowserDetails;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedRequest.BrowserDetails;
 
 /**
  * Exception that is thrown to indicate that creating or initializing the UI
diff --git a/server/src/com/vaadin/annotations/EagerInit.java b/server/src/com/vaadin/annotations/EagerInit.java
index 462c6bb5ac..f08d46b551 100644
--- a/server/src/com/vaadin/annotations/EagerInit.java
+++ b/server/src/com/vaadin/annotations/EagerInit.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /**
@@ -29,7 +29,7 @@ import com.vaadin.ui.UI;
  * This will make the UI appear more quickly, as ensuring the availability of
  * this information typically requires an additional round trip to the client.
  * 
- * @see UI#init(com.vaadin.terminal.WrappedRequest)
+ * @see UI#init(com.vaadin.server.WrappedRequest)
  * @see WrappedRequest#getBrowserDetails()
  * 
  * @since 7.0
diff --git a/server/src/com/vaadin/annotations/JavaScript.java b/server/src/com/vaadin/annotations/JavaScript.java
index 7943fe1055..1a2fdf7583 100644
--- a/server/src/com/vaadin/annotations/JavaScript.java
+++ b/server/src/com/vaadin/annotations/JavaScript.java
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.terminal.gwt.server.ClientConnector;
+import com.vaadin.server.ClientConnector;
 
 /**
  * If this annotation is present on a {@link ClientConnector} class, the
diff --git a/server/src/com/vaadin/annotations/StyleSheet.java b/server/src/com/vaadin/annotations/StyleSheet.java
index 7833544ab5..e1a9efd696 100644
--- a/server/src/com/vaadin/annotations/StyleSheet.java
+++ b/server/src/com/vaadin/annotations/StyleSheet.java
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.terminal.gwt.server.ClientConnector;
+import com.vaadin.server.ClientConnector;
 
 /**
  * If this annotation is present on a {@link ClientConnector} class, the
diff --git a/server/src/com/vaadin/data/Container.java b/server/src/com/vaadin/data/Container.java
index de53b88018..155dde87ef 100644
--- a/server/src/com/vaadin/data/Container.java
+++ b/server/src/com/vaadin/data/Container.java
@@ -1016,6 +1016,14 @@ public interface Container extends Serializable {
          * @param listener
          *            listener to be added
          */
+        public void addItemSetChangeListener(
+                Container.ItemSetChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addItemSetChangeListener(ItemSetChangeListener)}
+         **/
+        @Deprecated
         public void addListener(Container.ItemSetChangeListener listener);
 
         /**
@@ -1024,6 +1032,14 @@ public interface Container extends Serializable {
          * @param listener
          *            listener to be removed
          */
+        public void removeItemSetChangeListener(
+                Container.ItemSetChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removeItemSetChangeListener(ItemSetChangeListener)}
+         **/
+        @Deprecated
         public void removeListener(Container.ItemSetChangeListener listener);
     }
 
@@ -1102,6 +1118,14 @@ public interface Container extends Serializable {
          * @param listener
          *            The new Listener to be registered
          */
+        public void addPropertySetChangeListener(
+                Container.PropertySetChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addPropertySetChangeListener(PropertySetChangeListener)}
+         **/
+        @Deprecated
         public void addListener(Container.PropertySetChangeListener listener);
 
         /**
@@ -1110,6 +1134,14 @@ public interface Container extends Serializable {
          * @param listener
          *            Listener to be removed
          */
+        public void removePropertySetChangeListener(
+                Container.PropertySetChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removePropertySetChangeListener(PropertySetChangeListener)}
+         **/
+        @Deprecated
         public void removeListener(Container.PropertySetChangeListener listener);
     }
 }
diff --git a/server/src/com/vaadin/data/Item.java b/server/src/com/vaadin/data/Item.java
index 684027e608..8bdf963835 100644
--- a/server/src/com/vaadin/data/Item.java
+++ b/server/src/com/vaadin/data/Item.java
@@ -177,6 +177,14 @@ public interface Item extends Serializable {
          * @param listener
          *            The new Listener to be registered.
          */
+        public void addPropertySetChangeListener(
+                Item.PropertySetChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addPropertySetChangeListener(PropertySetChangeListener)}
+         **/
+        @Deprecated
         public void addListener(Item.PropertySetChangeListener listener);
 
         /**
@@ -185,6 +193,14 @@ public interface Item extends Serializable {
          * @param listener
          *            Listener to be removed.
          */
+        public void removePropertySetChangeListener(
+                Item.PropertySetChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removePropertySetChangeListener(PropertySetChangeListener)}
+         **/
+        @Deprecated
         public void removeListener(Item.PropertySetChangeListener listener);
     }
 }
diff --git a/server/src/com/vaadin/data/Property.java b/server/src/com/vaadin/data/Property.java
index 3e5c6826bb..7e46af09b7 100644
--- a/server/src/com/vaadin/data/Property.java
+++ b/server/src/com/vaadin/data/Property.java
@@ -304,6 +304,13 @@ public interface Property<T> extends Serializable {
          * @param listener
          *            the new Listener to be registered
          */
+        public void addValueChangeListener(Property.ValueChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addValueChangeListener(ValueChangeListener)}
+         **/
+        @Deprecated
         public void addListener(Property.ValueChangeListener listener);
 
         /**
@@ -312,6 +319,14 @@ public interface Property<T> extends Serializable {
          * @param listener
          *            listener to be removed
          */
+        public void removeValueChangeListener(
+                Property.ValueChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removeValueChangeListener(ValueChangeListener)}
+         **/
+        @Deprecated
         public void removeListener(Property.ValueChangeListener listener);
     }
 
@@ -379,6 +394,14 @@ public interface Property<T> extends Serializable {
          * @param listener
          *            the new Listener to be registered
          */
+        public void addReadOnlyStatusChangeListener(
+                Property.ReadOnlyStatusChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addReadOnlyStatusChangeListener(ReadOnlyStatusChangeListener)}
+         **/
+        @Deprecated
         public void addListener(Property.ReadOnlyStatusChangeListener listener);
 
         /**
@@ -387,6 +410,14 @@ public interface Property<T> extends Serializable {
          * @param listener
          *            listener to be removed
          */
+        public void removeReadOnlyStatusChangeListener(
+                Property.ReadOnlyStatusChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removeReadOnlyStatusChangeListener(ReadOnlyStatusChangeListener)}
+         **/
+        @Deprecated
         public void removeListener(
                 Property.ReadOnlyStatusChangeListener listener);
     }
diff --git a/server/src/com/vaadin/data/Validator.java b/server/src/com/vaadin/data/Validator.java
index ef07d3eadc..1755a44920 100644
--- a/server/src/com/vaadin/data/Validator.java
+++ b/server/src/com/vaadin/data/Validator.java
@@ -18,7 +18,7 @@ package com.vaadin.data;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
+import com.vaadin.server.AbstractApplicationServlet;
 
 /**
  * Interface that implements a method for validating if an {@link Object} is
diff --git a/server/src/com/vaadin/data/util/AbstractBeanContainer.java b/server/src/com/vaadin/data/util/AbstractBeanContainer.java
index 9cd4afa3c2..cb09cdad46 100644
--- a/server/src/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractBeanContainer.java
@@ -741,14 +741,35 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends
         return new PropertyBasedBeanIdResolver(propertyId);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by {@link #addPropertySetChangeListener}
+     **/
+    @Deprecated
     @Override
     public void addListener(Container.PropertySetChangeListener listener) {
-        super.addListener(listener);
+        addPropertySetChangeListener(listener);
+    }
+
+    @Override
+    public void addPropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
+        super.addPropertySetChangeListener(listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
     @Override
     public void removeListener(Container.PropertySetChangeListener listener) {
-        super.removeListener(listener);
+        removePropertySetChangeListener(listener);
+    }
+
+    @Override
+    public void removePropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
+        super.removePropertySetChangeListener(listener);
     }
 
     @Override
diff --git a/server/src/com/vaadin/data/util/AbstractContainer.java b/server/src/com/vaadin/data/util/AbstractContainer.java
index fbce468bce..ff8fc90651 100644
--- a/server/src/com/vaadin/data/util/AbstractContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractContainer.java
@@ -100,7 +100,8 @@ public abstract class AbstractContainer implements Container {
      * 
      * @see PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener)
      */
-    protected void addListener(Container.PropertySetChangeListener listener) {
+    protected void addPropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (getPropertySetChangeListeners() == null) {
             setPropertySetChangeListeners(new LinkedList<Container.PropertySetChangeListener>());
         }
@@ -108,6 +109,15 @@ public abstract class AbstractContainer implements Container {
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    protected void addListener(Container.PropertySetChangeListener listener) {
+        addPropertySetChangeListener(listener);
+    }
+
+    /**
      * Implementation of the corresponding method in
      * {@link PropertySetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
@@ -115,12 +125,22 @@ public abstract class AbstractContainer implements Container {
      * @see PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.
      *      PropertySetChangeListener)
      */
-    protected void removeListener(Container.PropertySetChangeListener listener) {
+    protected void removePropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (getPropertySetChangeListeners() != null) {
             getPropertySetChangeListeners().remove(listener);
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    protected void removeListener(Container.PropertySetChangeListener listener) {
+        removePropertySetChangeListener(listener);
+    }
+
     // ItemSetChangeNotifier
 
     /**
@@ -130,7 +150,8 @@ public abstract class AbstractContainer implements Container {
      * 
      * @see ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
-    protected void addListener(Container.ItemSetChangeListener listener) {
+    protected void addItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (getItemSetChangeListeners() == null) {
             setItemSetChangeListeners(new LinkedList<Container.ItemSetChangeListener>());
         }
@@ -138,19 +159,38 @@ public abstract class AbstractContainer implements Container {
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    protected void addListener(Container.ItemSetChangeListener listener) {
+        addItemSetChangeListener(listener);
+    }
+
+    /**
      * Implementation of the corresponding method in
      * {@link ItemSetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      * 
      * @see ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
-    protected void removeListener(Container.ItemSetChangeListener listener) {
+    protected void removeItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (getItemSetChangeListeners() != null) {
             getItemSetChangeListeners().remove(listener);
         }
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    protected void removeListener(Container.ItemSetChangeListener listener) {
+        removeItemSetChangeListener(listener);
+    }
+
+    /**
      * Sends a simple Property set change event to all interested listeners.
      */
     protected void fireContainerPropertySetChange() {
diff --git a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
index fd2ced2d4a..6eea9cb421 100644
--- a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
@@ -324,15 +324,36 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     }
 
     // ItemSetChangeNotifier
-
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
     @Override
     public void addListener(Container.ItemSetChangeListener listener) {
-        super.addListener(listener);
+        addItemSetChangeListener(listener);
+    }
+
+    @Override
+    public void addItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
+        super.addItemSetChangeListener(listener);
     }
 
     @Override
+    public void removeItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
+        super.removeItemSetChangeListener(listener);
+    }
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    @Override
     public void removeListener(Container.ItemSetChangeListener listener) {
-        super.removeListener(listener);
+        removeItemSetChangeListener(listener);
     }
 
     // internal methods
diff --git a/server/src/com/vaadin/data/util/AbstractProperty.java b/server/src/com/vaadin/data/util/AbstractProperty.java
index f508156d05..6636996cd5 100644
--- a/server/src/com/vaadin/data/util/AbstractProperty.java
+++ b/server/src/com/vaadin/data/util/AbstractProperty.java
@@ -121,7 +121,8 @@ public abstract class AbstractProperty<T> implements Property<T>,
      *            the new Listener to be registered.
      */
     @Override
-    public void addListener(Property.ReadOnlyStatusChangeListener listener) {
+    public void addReadOnlyStatusChangeListener(
+            Property.ReadOnlyStatusChangeListener listener) {
         if (readOnlyStatusChangeListeners == null) {
             readOnlyStatusChangeListeners = new LinkedList<ReadOnlyStatusChangeListener>();
         }
@@ -129,19 +130,38 @@ public abstract class AbstractProperty<T> implements Property<T>,
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Property.ReadOnlyStatusChangeListener listener) {
+        addReadOnlyStatusChangeListener(listener);
+    }
+
+    /**
      * Removes a previously registered read-only status change listener.
      * 
      * @param listener
      *            the listener to be removed.
      */
     @Override
-    public void removeListener(Property.ReadOnlyStatusChangeListener listener) {
+    public void removeReadOnlyStatusChangeListener(
+            Property.ReadOnlyStatusChangeListener listener) {
         if (readOnlyStatusChangeListeners != null) {
             readOnlyStatusChangeListeners.remove(listener);
         }
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Property.ReadOnlyStatusChangeListener listener) {
+        removeReadOnlyStatusChangeListener(listener);
+    }
+
+    /**
      * Sends a read only status change event to all registered listeners.
      */
     protected void fireReadOnlyStatusChange() {
@@ -186,7 +206,7 @@ public abstract class AbstractProperty<T> implements Property<T>,
     }
 
     @Override
-    public void addListener(ValueChangeListener listener) {
+    public void addValueChangeListener(ValueChangeListener listener) {
         if (valueChangeListeners == null) {
             valueChangeListeners = new LinkedList<ValueChangeListener>();
         }
@@ -194,8 +214,17 @@ public abstract class AbstractProperty<T> implements Property<T>,
 
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(ValueChangeListener listener) {
+        addValueChangeListener(listener);
+    }
+
     @Override
-    public void removeListener(ValueChangeListener listener) {
+    public void removeValueChangeListener(ValueChangeListener listener) {
         if (valueChangeListeners != null) {
             valueChangeListeners.remove(listener);
         }
@@ -203,6 +232,15 @@ public abstract class AbstractProperty<T> implements Property<T>,
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(ValueChangeListener listener) {
+        removeValueChangeListener(listener);
+    }
+
+    /**
      * Sends a value change event to all registered listeners.
      */
     protected void fireValueChange() {
diff --git a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 8f9000bce0..24d0a8d3a0 100644
--- a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
@@ -710,53 +710,95 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * interface.
      */
     @Override
-    public void addListener(Container.ItemSetChangeListener listener) {
+    public void addItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (container instanceof Container.ItemSetChangeNotifier) {
             ((Container.ItemSetChangeNotifier) container)
-                    .addListener(new PiggybackListener(listener));
+                    .addItemSetChangeListener(new PiggybackListener(listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Container.ItemSetChangeListener listener) {
+        addItemSetChangeListener(listener);
+    }
+
     /*
      * Removes a Item set change listener from the object. Don't add a JavaDoc
      * comment here, we use the default documentation from implemented
      * interface.
      */
     @Override
-    public void removeListener(Container.ItemSetChangeListener listener) {
+    public void removeItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (container instanceof Container.ItemSetChangeNotifier) {
             ((Container.ItemSetChangeNotifier) container)
-                    .removeListener(new PiggybackListener(listener));
+                    .removeItemSetChangeListener(new PiggybackListener(listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Container.ItemSetChangeListener listener) {
+        removeItemSetChangeListener(listener);
+    }
+
     /*
      * Registers a new Property set change listener for this Container. Don't
      * add a JavaDoc comment here, we use the default documentation from
      * implemented interface.
      */
     @Override
-    public void addListener(Container.PropertySetChangeListener listener) {
+    public void addPropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (container instanceof Container.PropertySetChangeNotifier) {
             ((Container.PropertySetChangeNotifier) container)
-                    .addListener(new PiggybackListener(listener));
+                    .addPropertySetChangeListener(new PiggybackListener(
+                            listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Container.PropertySetChangeListener listener) {
+        addPropertySetChangeListener(listener);
+    }
+
     /*
      * Removes a Property set change listener from the object. Don't add a
      * JavaDoc comment here, we use the default documentation from implemented
      * interface.
      */
     @Override
-    public void removeListener(Container.PropertySetChangeListener listener) {
+    public void removePropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (container instanceof Container.PropertySetChangeNotifier) {
             ((Container.PropertySetChangeNotifier) container)
-                    .removeListener(new PiggybackListener(listener));
+                    .removePropertySetChangeListener(new PiggybackListener(
+                            listener));
         }
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Container.PropertySetChangeListener listener) {
+        removePropertySetChangeListener(listener);
+    }
+
+    /**
      * This listener 'piggybacks' on the real listener in order to update the
      * wrapper when needed. It proxies equals() and hashCode() to the real
      * listener so that the correct listener gets removed.
diff --git a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
index d332931008..bb904f4cda 100644
--- a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
+++ b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
@@ -510,52 +510,94 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * interface.
      */
     @Override
-    public void addListener(Container.ItemSetChangeListener listener) {
+    public void addItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (container instanceof Container.ItemSetChangeNotifier) {
             ((Container.ItemSetChangeNotifier) container)
-                    .addListener(new PiggybackListener(listener));
+                    .addItemSetChangeListener(new PiggybackListener(listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Container.ItemSetChangeListener listener) {
+        addItemSetChangeListener(listener);
+    }
+
     /*
      * Removes a Item set change listener from the object. Don't add a JavaDoc
      * comment here, we use the default documentation from implemented
      * interface.
      */
     @Override
-    public void removeListener(Container.ItemSetChangeListener listener) {
+    public void removeItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (container instanceof Container.ItemSetChangeNotifier) {
             ((Container.ItemSetChangeNotifier) container)
-                    .removeListener(new PiggybackListener(listener));
+                    .removeItemSetChangeListener(new PiggybackListener(listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Container.ItemSetChangeListener listener) {
+        removeItemSetChangeListener(listener);
+    }
+
     /*
      * Registers a new Property set change listener for this Container. Don't
      * add a JavaDoc comment here, we use the default documentation from
      * implemented interface.
      */
     @Override
-    public void addListener(Container.PropertySetChangeListener listener) {
+    public void addPropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (container instanceof Container.PropertySetChangeNotifier) {
             ((Container.PropertySetChangeNotifier) container)
-                    .addListener(new PiggybackListener(listener));
+                    .addPropertySetChangeListener(new PiggybackListener(
+                            listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Container.PropertySetChangeListener listener) {
+        addPropertySetChangeListener(listener);
+    }
+
     /*
      * Removes a Property set change listener from the object. Don't add a
      * JavaDoc comment here, we use the default documentation from implemented
      * interface.
      */
     @Override
-    public void removeListener(Container.PropertySetChangeListener listener) {
+    public void removePropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (container instanceof Container.PropertySetChangeNotifier) {
             ((Container.PropertySetChangeNotifier) container)
-                    .removeListener(new PiggybackListener(listener));
+                    .removePropertySetChangeListener(new PiggybackListener(
+                            listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Container.PropertySetChangeListener listener) {
+        removePropertySetChangeListener(listener);
+    }
+
     /*
      * (non-Javadoc)
      * 
diff --git a/server/src/com/vaadin/data/util/FilesystemContainer.java b/server/src/com/vaadin/data/util/FilesystemContainer.java
index 54ee2d6f0c..4c27169409 100644
--- a/server/src/com/vaadin/data/util/FilesystemContainer.java
+++ b/server/src/com/vaadin/data/util/FilesystemContainer.java
@@ -33,8 +33,8 @@ import java.util.List;
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
+import com.vaadin.server.Resource;
 import com.vaadin.service.FileTypeResolver;
-import com.vaadin.terminal.Resource;
 
 /**
  * A hierarchical container wrapper for a filesystem.
diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java
index 5566b2f18c..e0a8fe1dc1 100644
--- a/server/src/com/vaadin/data/util/IndexedContainer.java
+++ b/server/src/com/vaadin/data/util/IndexedContainer.java
@@ -483,13 +483,35 @@ public class IndexedContainer extends
     }
 
     @Override
+    public void addPropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
+        super.addPropertySetChangeListener(listener);
+    }
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    @Override
     public void addListener(Container.PropertySetChangeListener listener) {
-        super.addListener(listener);
+        addPropertySetChangeListener(listener);
     }
 
     @Override
+    public void removePropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
+        super.removePropertySetChangeListener(listener);
+    }
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    @Override
     public void removeListener(Container.PropertySetChangeListener listener) {
-        super.removeListener(listener);
+        removePropertySetChangeListener(listener);
     }
 
     /*
@@ -499,13 +521,22 @@ public class IndexedContainer extends
      * vaadin.data.Property.ValueChangeListener)
      */
     @Override
-    public void addListener(Property.ValueChangeListener listener) {
+    public void addValueChangeListener(Property.ValueChangeListener listener) {
         if (propertyValueChangeListeners == null) {
             propertyValueChangeListeners = new LinkedList<Property.ValueChangeListener>();
         }
         propertyValueChangeListeners.add(listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Property.ValueChangeListener listener) {
+        addValueChangeListener(listener);
+    }
+
     /*
      * (non-Javadoc)
      * 
@@ -513,13 +544,22 @@ public class IndexedContainer extends
      * .vaadin.data.Property.ValueChangeListener)
      */
     @Override
-    public void removeListener(Property.ValueChangeListener listener) {
+    public void removeValueChangeListener(Property.ValueChangeListener listener) {
         if (propertyValueChangeListeners != null) {
             propertyValueChangeListeners.remove(listener);
         }
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Property.ValueChangeListener listener) {
+        removeValueChangeListener(listener);
+    }
+
+    /**
      * Sends a Property value change event to all interested listeners.
      * 
      * @param source
@@ -965,10 +1005,19 @@ public class IndexedContainer extends
          * com.vaadin.data.Property.ValueChangeListener)
          */
         @Override
-        public void addListener(Property.ValueChangeListener listener) {
+        public void addValueChangeListener(Property.ValueChangeListener listener) {
             addSinglePropertyChangeListener(propertyId, itemId, listener);
         }
 
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+         **/
+        @Deprecated
+        public void addListener(Property.ValueChangeListener listener) {
+            addValueChangeListener(listener);
+        }
+
         /*
          * (non-Javadoc)
          * 
@@ -976,10 +1025,20 @@ public class IndexedContainer extends
          * (com.vaadin.data.Property.ValueChangeListener)
          */
         @Override
-        public void removeListener(Property.ValueChangeListener listener) {
+        public void removeValueChangeListener(
+                Property.ValueChangeListener listener) {
             removeSinglePropertyChangeListener(propertyId, itemId, listener);
         }
 
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+         **/
+        @Deprecated
+        public void removeListener(Property.ValueChangeListener listener) {
+            removeValueChangeListener(listener);
+        }
+
         private IndexedContainer getHost() {
             return IndexedContainer.this;
         }
diff --git a/server/src/com/vaadin/data/util/PropertysetItem.java b/server/src/com/vaadin/data/util/PropertysetItem.java
index e86d813809..6fba011d75 100644
--- a/server/src/com/vaadin/data/util/PropertysetItem.java
+++ b/server/src/com/vaadin/data/util/PropertysetItem.java
@@ -200,7 +200,8 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier,
      *            the new Listener to be registered.
      */
     @Override
-    public void addListener(Item.PropertySetChangeListener listener) {
+    public void addPropertySetChangeListener(
+            Item.PropertySetChangeListener listener) {
         if (propertySetChangeListeners == null) {
             propertySetChangeListeners = new LinkedList<PropertySetChangeListener>();
         }
@@ -208,19 +209,38 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier,
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Item.PropertySetChangeListener listener) {
+        addPropertySetChangeListener(listener);
+    }
+
+    /**
      * Removes a previously registered property set change listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
     @Override
-    public void removeListener(Item.PropertySetChangeListener listener) {
+    public void removePropertySetChangeListener(
+            Item.PropertySetChangeListener listener) {
         if (propertySetChangeListeners != null) {
             propertySetChangeListeners.remove(listener);
         }
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Item.PropertySetChangeListener listener) {
+        removePropertySetChangeListener(listener);
+    }
+
+    /**
      * Sends a Property set change event to all interested listeners.
      */
     private void fireItemPropertySetChange() {
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index 13248f1e06..a53f32b96e 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
@@ -1493,13 +1493,23 @@ public class SQLContainer implements Container, Container.Filterable,
      */
 
     @Override
-    public void addListener(Container.ItemSetChangeListener listener) {
+    public void addItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (itemSetChangeListeners == null) {
             itemSetChangeListeners = new LinkedList<Container.ItemSetChangeListener>();
         }
         itemSetChangeListeners.add(listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Container.ItemSetChangeListener listener) {
+        addItemSetChangeListener(listener);
+    }
+
     /*
      * (non-Javadoc)
      * 
@@ -1509,12 +1519,22 @@ public class SQLContainer implements Container, Container.Filterable,
      */
 
     @Override
-    public void removeListener(Container.ItemSetChangeListener listener) {
+    public void removeItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (itemSetChangeListeners != null) {
             itemSetChangeListeners.remove(listener);
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Container.ItemSetChangeListener listener) {
+        removeItemSetChangeListener(listener);
+    }
+
     protected void fireContentsChange() {
         if (itemSetChangeListeners != null) {
             final Object[] l = itemSetChangeListeners.toArray();
@@ -1553,7 +1573,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * 
      * @param listener
      */
-    public void addListener(RowIdChangeListener listener) {
+    public void addRowIdChangeListener(RowIdChangeListener listener) {
         if (delegate instanceof QueryDelegate.RowIdChangeNotifier) {
             ((QueryDelegate.RowIdChangeNotifier) delegate)
                     .addListener(listener);
@@ -1561,11 +1581,20 @@ public class SQLContainer implements Container, Container.Filterable,
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addRowIdChangeListener(RowIdChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(RowIdChangeListener listener) {
+        addRowIdChangeListener(listener);
+    }
+
+    /**
      * Removes a RowIdChangeListener from the QueryDelegate
      * 
      * @param listener
      */
-    public void removeListener(RowIdChangeListener listener) {
+    public void removeRowIdChangeListener(RowIdChangeListener listener) {
         if (delegate instanceof QueryDelegate.RowIdChangeNotifier) {
             ((QueryDelegate.RowIdChangeNotifier) delegate)
                     .removeListener(listener);
@@ -1573,6 +1602,15 @@ public class SQLContainer implements Container, Container.Filterable,
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeRowIdChangeListener(RowIdChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(RowIdChangeListener listener) {
+        removeRowIdChangeListener(listener);
+    }
+
+    /**
      * Calling this will enable this SQLContainer to send and receive cache
      * flush notifications for its lifetime.
      */
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
index 3e1866932b..10a710e823 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
@@ -210,6 +210,14 @@ public interface QueryDelegate extends Serializable {
          * @param listener
          *            listener to be added
          */
+        public void addRowIdChangeListener(
+                QueryDelegate.RowIdChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addRowIdChangeListener(RowIdChangeListener)}
+         **/
+        @Deprecated
         public void addListener(QueryDelegate.RowIdChangeListener listener);
 
         /**
@@ -218,6 +226,14 @@ public interface QueryDelegate extends Serializable {
          * @param listener
          *            listener to be removed
          */
+        public void removeRowIdChangeListener(
+                QueryDelegate.RowIdChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removeRowIdChangeListener(RowIdChangeListener)}
+         **/
+        @Deprecated
         public void removeListener(QueryDelegate.RowIdChangeListener listener);
     }
 }
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
index e4544a491a..a6a1a5a8fb 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
@@ -704,7 +704,7 @@ public class TableQuery implements QueryDelegate,
      * Adds RowIdChangeListener to this query
      */
     @Override
-    public void addListener(RowIdChangeListener listener) {
+    public void addRowIdChangeListener(RowIdChangeListener listener) {
         if (rowIdChangeListeners == null) {
             rowIdChangeListeners = new LinkedList<QueryDelegate.RowIdChangeListener>();
         }
@@ -712,15 +712,33 @@ public class TableQuery implements QueryDelegate,
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(RowIdChangeListener listener) {
+        addRowIdChangeListener(listener);
+    }
+
+    /**
      * Removes the given RowIdChangeListener from this query
      */
     @Override
-    public void removeListener(RowIdChangeListener listener) {
+    public void removeRowIdChangeListener(RowIdChangeListener listener) {
         if (rowIdChangeListeners != null) {
             rowIdChangeListeners.remove(listener);
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(RowIdChangeListener listener) {
+        removeRowIdChangeListener(listener);
+    }
+
     private static final Logger getLogger() {
         return Logger.getLogger(TableQuery.class.getName());
     }
diff --git a/server/src/com/vaadin/event/Action.java b/server/src/com/vaadin/event/Action.java
index aca28940a1..b8296418d3 100644
--- a/server/src/com/vaadin/event/Action.java
+++ b/server/src/com/vaadin/event/Action.java
@@ -18,7 +18,7 @@ package com.vaadin.event;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.Resource;
 
 /**
  * Implements the action framework. This class contains subinterfaces for action
diff --git a/server/src/com/vaadin/event/ActionManager.java b/server/src/com/vaadin/event/ActionManager.java
index 296d12ba92..85a1bf0f12 100644
--- a/server/src/com/vaadin/event/ActionManager.java
+++ b/server/src/com/vaadin/event/ActionManager.java
@@ -20,10 +20,10 @@ import java.util.Map;
 
 import com.vaadin.event.Action.Container;
 import com.vaadin.event.Action.Handler;
-import com.vaadin.terminal.KeyMapper;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.VariableOwner;
+import com.vaadin.server.KeyMapper;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.VariableOwner;
 import com.vaadin.ui.Component;
 
 /**
diff --git a/server/src/com/vaadin/event/FieldEvents.java b/server/src/com/vaadin/event/FieldEvents.java
index 8e247a6fef..10df08291e 100644
--- a/server/src/com/vaadin/event/FieldEvents.java
+++ b/server/src/com/vaadin/event/FieldEvents.java
@@ -59,6 +59,13 @@ public interface FieldEvents {
          * @see FocusListener
          * @since 6.2
          */
+        public void addFocusListener(FocusListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addFocusListener(FocusListener)}
+         **/
+        @Deprecated
         public void addListener(FocusListener listener);
 
         /**
@@ -68,6 +75,13 @@ public interface FieldEvents {
          * @see FocusListener
          * @since 6.2
          */
+        public void removeFocusListener(FocusListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removeFocusListener(FocusListener)}
+         **/
+        @Deprecated
         public void removeListener(FocusListener listener);
     }
 
@@ -97,6 +111,13 @@ public interface FieldEvents {
          * @see BlurListener
          * @since 6.2
          */
+        public void addBlurListener(BlurListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addBlurListener(BlurListener)}
+         **/
+        @Deprecated
         public void addListener(BlurListener listener);
 
         /**
@@ -106,6 +127,13 @@ public interface FieldEvents {
          * @see BlurListener
          * @since 6.2
          */
+        public void removeBlurListener(BlurListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removeBlurListener(BlurListener)}
+         **/
+        @Deprecated
         public void removeListener(BlurListener listener);
     }
 
@@ -257,8 +285,22 @@ public interface FieldEvents {
      * {@link TextChangeListener}s.
      */
     public interface TextChangeNotifier extends Serializable {
+        public void addTextChangeListener(TextChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addTextChangeListener(TextChangeListener)}
+         **/
+        @Deprecated
         public void addListener(TextChangeListener listener);
 
+        public void removeTextChangeListener(TextChangeListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removeTextChangeListener(TextChangeListener)}
+         **/
+        @Deprecated
         public void removeListener(TextChangeListener listener);
     }
 
diff --git a/server/src/com/vaadin/event/ItemClickEvent.java b/server/src/com/vaadin/event/ItemClickEvent.java
index c736353614..99c36cf51b 100644
--- a/server/src/com/vaadin/event/ItemClickEvent.java
+++ b/server/src/com/vaadin/event/ItemClickEvent.java
@@ -119,6 +119,13 @@ public class ItemClickEvent extends ClickEvent implements Serializable {
          * @param listener
          *            ItemClickListener to be registered
          */
+        public void addItemClickListener(ItemClickListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addItemClickListener(ItemClickListener)}
+         **/
+        @Deprecated
         public void addListener(ItemClickListener listener);
 
         /**
@@ -127,6 +134,13 @@ public class ItemClickEvent extends ClickEvent implements Serializable {
          * @param listener
          *            ItemClickListener to be removed
          */
+        public void removeItemClickListener(ItemClickListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removeItemClickListener(ItemClickListener)}
+         **/
+        @Deprecated
         public void removeListener(ItemClickListener listener);
     }
 
diff --git a/server/src/com/vaadin/event/LayoutEvents.java b/server/src/com/vaadin/event/LayoutEvents.java
index 7fc6e5a42d..7f88ddc640 100644
--- a/server/src/com/vaadin/event/LayoutEvents.java
+++ b/server/src/com/vaadin/event/LayoutEvents.java
@@ -78,6 +78,13 @@ public interface LayoutEvents {
          * @param listener
          *            The listener to add
          */
+        public void addLayoutClickListener(LayoutClickListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addLayoutClickListener(LayoutClickListener)}
+         **/
+        @Deprecated
         public void addListener(LayoutClickListener listener);
 
         /**
@@ -86,6 +93,13 @@ public interface LayoutEvents {
          * @param listener
          *            LayoutClickListener to be removed
          */
+        public void removeLayoutClickListener(LayoutClickListener listener);
+
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removeLayoutClickListener(LayoutClickListener)}
+         **/
+        @Deprecated
         public void removeListener(LayoutClickListener listener);
     }
 
diff --git a/server/src/com/vaadin/event/ShortcutAction.java b/server/src/com/vaadin/event/ShortcutAction.java
index b3f41b474d..b1d14b15fe 100644
--- a/server/src/com/vaadin/event/ShortcutAction.java
+++ b/server/src/com/vaadin/event/ShortcutAction.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.Resource;
 import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Window;
diff --git a/server/src/com/vaadin/event/ShortcutListener.java b/server/src/com/vaadin/event/ShortcutListener.java
index 82a09585b3..d7e0577e84 100644
--- a/server/src/com/vaadin/event/ShortcutListener.java
+++ b/server/src/com/vaadin/event/ShortcutListener.java
@@ -16,7 +16,7 @@
 package com.vaadin.event;
 
 import com.vaadin.event.Action.Listener;
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.Resource;
 
 public abstract class ShortcutListener extends ShortcutAction implements
         Listener {
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
index 7b04efc4b3..850e68b231 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
@@ -23,8 +23,8 @@ import java.io.Serializable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * Criterion that can be used create policy to accept/discard dragged content
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/And.java b/server/src/com/vaadin/event/dd/acceptcriteria/And.java
index 3d11ecf7bf..183010a298 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/And.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/And.java
@@ -19,8 +19,8 @@
 package com.vaadin.event.dd.acceptcriteria;
 
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * A compound criterion that accepts the drag if all of its criteria accepts the
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java
index be7e2d4033..e862cdfd39 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java
@@ -17,8 +17,8 @@ package com.vaadin.event.dd.acceptcriteria;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * Parent class for criteria that can be completely validated on client side.
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java b/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java
index 55ee17fea9..97094814ef 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java
@@ -20,8 +20,8 @@ package com.vaadin.event.dd.acceptcriteria;
 
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * A Criterion that checks whether {@link Transferable} contains given data
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/Not.java b/server/src/com/vaadin/event/dd/acceptcriteria/Not.java
index b3f73699ea..9e1b1571ae 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/Not.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/Not.java
@@ -19,8 +19,8 @@
 package com.vaadin.event.dd.acceptcriteria;
 
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * Criterion that wraps another criterion and inverts its return value.
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/Or.java b/server/src/com/vaadin/event/dd/acceptcriteria/Or.java
index 42d1c3293d..7aa7d8cd20 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/Or.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/Or.java
@@ -19,8 +19,8 @@
 package com.vaadin.event.dd.acceptcriteria;
 
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * A compound criterion that accepts the drag if any of its criterion accepts
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java
index b9c2855021..b7457605b8 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java
@@ -18,8 +18,8 @@ package com.vaadin.event.dd.acceptcriteria;
 import java.io.Serializable;
 
 import com.vaadin.event.Transferable;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * Parent class for criteria which are verified on the server side during a drag
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java b/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java
index cc1d586076..6258aed423 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java
@@ -23,8 +23,8 @@ import java.util.logging.Logger;
 
 import com.vaadin.event.TransferableImpl;
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 import com.vaadin.ui.Component;
 
 /**
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java b/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
index 536ba8780e..a6d3e2c5d5 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
@@ -20,8 +20,8 @@ package com.vaadin.event.dd.acceptcriteria;
 
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.TargetDetails;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * Criterion for checking if drop target details contains the specific property
diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java
index 13e87c16ad..cef27c221d 100644
--- a/server/src/com/vaadin/navigator/Navigator.java
+++ b/server/src/com/vaadin/navigator/Navigator.java
@@ -22,9 +22,9 @@ import java.util.LinkedList;
 import java.util.List;
 
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Page.FragmentChangedEvent;
-import com.vaadin.terminal.Page.FragmentChangedListener;
+import com.vaadin.server.Page;
+import com.vaadin.server.Page.FragmentChangedEvent;
+import com.vaadin.server.Page.FragmentChangedListener;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.CssLayout;
@@ -435,7 +435,7 @@ public class Navigator implements Serializable {
             }
         }
         if (viewWithLongestName != null) {
-            String parameters = null;
+            String parameters = "";
             if (viewAndParameters.length() > longestViewName.length() + 1) {
                 parameters = viewAndParameters.substring(longestViewName
                         .length() + 1);
@@ -469,7 +469,7 @@ public class Navigator implements Serializable {
 
         if (null != viewName && getFragmentManager() != null) {
             String currentFragment = viewName;
-            if (fragmentParameters != null) {
+            if (!fragmentParameters.equals("")) {
                 currentFragment += "/" + fragmentParameters;
             }
             if (!currentFragment.equals(getFragmentManager().getFragment())) {
@@ -651,18 +651,36 @@ public class Navigator implements Serializable {
      * @param listener
      *            Listener to invoke after view changes.
      */
-    public void addListener(ViewChangeListener listener) {
+    public void addViewChangeListener(ViewChangeListener listener) {
         listeners.add(listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addViewChangeListener(ViewChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(ViewChangeListener listener) {
+        addViewChangeListener(listener);
+    }
+
+    /**
      * Remove a view change listener.
      * 
      * @param listener
      *            Listener to remove.
      */
-    public void removeListener(ViewChangeListener listener) {
+    public void removeViewChangeListener(ViewChangeListener listener) {
         listeners.remove(listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeViewChangeListener(ViewChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(ViewChangeListener listener) {
+        removeViewChangeListener(listener);
+    }
+
 }
diff --git a/server/src/com/vaadin/navigator/View.java b/server/src/com/vaadin/navigator/View.java
index 4db334a2dd..caee801f0c 100644
--- a/server/src/com/vaadin/navigator/View.java
+++ b/server/src/com/vaadin/navigator/View.java
@@ -38,11 +38,9 @@ public interface View extends Serializable {
      * is any additional id to data what should be shown in the view, it is also
      * optionally passed as parameter.
      * 
-     * TODO fragmentParameters null if no parameters or empty string?
-     * 
      * @param fragmentParameters
-     *            parameters to the view or null if none given. This is the
-     *            string that appears e.g. in URI after "viewname/"
+     *            parameters to the view or empty string if none given. This is
+     *            the string that appears e.g. in URI after "viewname/"
      */
     public void navigateTo(String fragmentParameters);
 }
\ No newline at end of file
diff --git a/server/src/com/vaadin/package.html b/server/src/com/vaadin/package.html
index f771019709..097fd94aca 100644
--- a/server/src/com/vaadin/package.html
+++ b/server/src/com/vaadin/package.html
@@ -5,22 +5,20 @@
 
 <body bgcolor="white">
 
-<p>The Vaadin base package. Contains the Application class, the
-starting point of any application that uses Vaadin.</p>
+	<p>The Vaadin base package. Contains the Application class, the
+		starting point of any application that uses Vaadin.</p>
 
-<p>Contains all Vaadin core classes. A Vaadin application is based
-on the {@link com.vaadin.Application} class and deployed as a servlet
-using {@link com.vaadin.terminal.gwt.server.ApplicationServlet} or
-{@link com.vaadin.terminal.gwt.server.GAEApplicationServlet} (for Google
-App Engine).</p>
+	<p>Contains all Vaadin core classes. A Vaadin application is based
+		on the {@link com.vaadin.Application} class and deployed as a servlet
+		using {@link com.vaadin.server.ApplicationServlet} or {@link
+		com.vaadin.server.GAEApplicationServlet} (for Google App Engine).</p>
 
-<p>Vaadin applications can also be deployed as portlets using {@link
-com.vaadin.terminal.gwt.server.ApplicationPortlet} (JSR-168) or {@link
-com.vaadin.terminal.gwt.server.ApplicationPortlet2} (JSR-286).</p>
+	<p>Vaadin applications can also be deployed as portlets using
+		{@link com.vaadin.server.ApplicationPortlet2} (JSR-286).</p>
 
-<p>All classes in Vaadin are serializable unless otherwise noted.
-This allows Vaadin applications to run in cluster and cloud
-environments.</p>
+	<p>All classes in Vaadin are serializable unless otherwise noted.
+		This allows Vaadin applications to run in cluster and cloud
+		environments.</p>
 
 
 </body>
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/server/src/com/vaadin/server/AbstractApplicationPortlet.java
index 345f462239..e47e00577b 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
+++ b/server/src/com/vaadin/server/AbstractApplicationPortlet.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -57,11 +57,7 @@ import com.vaadin.Application;
 import com.vaadin.Application.ApplicationStartEvent;
 import com.vaadin.Application.SystemMessages;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.Terminal;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
-import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback;
+import com.vaadin.server.AbstractCommunicationManager.Callback;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/server/src/com/vaadin/server/AbstractApplicationServlet.java
index 13fd869166..2f0dad7079 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/server/src/com/vaadin/server/AbstractApplicationServlet.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -49,13 +49,8 @@ import javax.servlet.http.HttpSession;
 import com.vaadin.Application;
 import com.vaadin.Application.ApplicationStartEvent;
 import com.vaadin.Application.SystemMessages;
+import com.vaadin.server.AbstractCommunicationManager.Callback;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.Terminal;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
-import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/server/src/com/vaadin/terminal/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java
index 157bd17e41..2f660a443d 100644
--- a/server/src/com/vaadin/terminal/AbstractClientConnector.java
+++ b/server/src/com/vaadin/server/AbstractClientConnector.java
@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal;
+package com.vaadin.server;
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationHandler;
@@ -36,12 +37,6 @@ import com.vaadin.external.json.JSONObject;
 import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.shared.communication.SharedState;
-import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
-import com.vaadin.terminal.gwt.server.ClientConnector;
-import com.vaadin.terminal.gwt.server.ClientMethodInvocation;
-import com.vaadin.terminal.gwt.server.RpcManager;
-import com.vaadin.terminal.gwt.server.RpcTarget;
-import com.vaadin.terminal.gwt.server.ServerRpcManager;
 import com.vaadin.ui.HasComponents;
 import com.vaadin.ui.UI;
 
@@ -373,8 +368,8 @@ public abstract class AbstractClientConnector implements ClientConnector {
 
     /**
      * Finds a UI ancestor of this connector. <code>null</code> is returned if
-     * no UI ancestor is found (typically because the connector is not
-     * attached to a proper hierarchy).
+     * no UI ancestor is found (typically because the connector is not attached
+     * to a proper hierarchy).
      * 
      * @return the UI ancestor of this connector, or <code>null</code> if none
      *         is found.
@@ -567,4 +562,59 @@ public abstract class AbstractClientConnector implements ClientConnector {
     public void beforeClientResponse(boolean initial) {
         // Do nothing by default
     }
+
+    @Override
+    public boolean handleConnectorRequest(WrappedRequest request,
+            WrappedResponse response, String path) throws IOException {
+        String[] parts = path.split("/", 2);
+        String key = parts[0];
+
+        ConnectorResource resource = (ConnectorResource) getResource(key);
+        if (resource != null) {
+            DownloadStream stream = resource.getStream();
+            stream.writeResponse(request, response);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Gets a resource defined using {@link #setResource(String, Resource)} with
+     * the corresponding key.
+     * 
+     * @param key
+     *            the string identifier of the resource
+     * @return a resource, or <code>null</code> if there's no resource
+     *         associated with the given key
+     * 
+     * @see #setResource(String, Resource)
+     */
+    protected Resource getResource(String key) {
+        return ResourceReference.getResource(getState().resources.get(key));
+    }
+
+    /**
+     * Registers a resource with this connector using the given key. This will
+     * make the URL for retrieving the resource available to the client-side
+     * connector using
+     * {@link com.vaadin.terminal.gwt.client.ui.AbstractConnector#getResourceUrl(String)}
+     * with the same key.
+     * 
+     * @param key
+     *            the string key to associate the resource with
+     * @param resource
+     *            the resource to set, or <code>null</code> to clear a previous
+     *            association.
+     */
+    protected void setResource(String key, Resource resource) {
+        ResourceReference resourceReference = ResourceReference.create(
+                resource, this, key);
+
+        if (resourceReference == null) {
+            getState().resources.remove(key);
+        } else {
+            getState().resources.put(key, resourceReference);
+        }
+    }
 }
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java
index 81c497713b..2655ee9a00 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
@@ -66,6 +66,13 @@ import com.vaadin.annotations.StyleSheet;
 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
+import com.vaadin.server.BootstrapHandler.BootstrapContext;
+import com.vaadin.server.ComponentSizeValidator.InvalidLayout;
+import com.vaadin.server.RpcManager.RpcInvocationException;
+import com.vaadin.server.StreamVariable.StreamingEndEvent;
+import com.vaadin.server.StreamVariable.StreamingErrorEvent;
+import com.vaadin.server.Terminal.ErrorEvent;
+import com.vaadin.server.Terminal.ErrorListener;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.JavaScriptConnectorState;
@@ -75,24 +82,6 @@ import com.vaadin.shared.communication.MethodInvocation;
 import com.vaadin.shared.communication.SharedState;
 import com.vaadin.shared.communication.UidlValue;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.AbstractClientConnector;
-import com.vaadin.terminal.CombinedRequest;
-import com.vaadin.terminal.LegacyPaint;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.StreamVariable;
-import com.vaadin.terminal.StreamVariable.StreamingEndEvent;
-import com.vaadin.terminal.StreamVariable.StreamingErrorEvent;
-import com.vaadin.terminal.Terminal.ErrorEvent;
-import com.vaadin.terminal.Terminal.ErrorListener;
-import com.vaadin.terminal.Vaadin6Component;
-import com.vaadin.terminal.VariableOwner;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
-import com.vaadin.terminal.gwt.server.BootstrapHandler.BootstrapContext;
-import com.vaadin.terminal.gwt.server.ComponentSizeValidator.InvalidLayout;
-import com.vaadin.terminal.gwt.server.RpcManager.RpcInvocationException;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Component;
@@ -105,7 +94,7 @@ import com.vaadin.ui.Window;
  * This is a common base class for the server-side implementations of the
  * communication system between the client code (compiled with GWT into
  * JavaScript) and the server side components. Its client side counterpart is
- * {@link com.vaadin.terminal.gwt.client.ApplicationConnection}.
+ * {@link com.vaadin.client.ApplicationConnection}.
  * <p>
  * TODO Document better!
  */
@@ -114,10 +103,10 @@ public abstract class AbstractCommunicationManager implements Serializable {
 
     private static final String DASHDASH = "--";
 
-    private static final RequestHandler APP_RESOURCE_HANDLER = new ApplicationResourceHandler();
-
     private static final RequestHandler UNSUPPORTED_BROWSER_HANDLER = new UnsupportedBrowserHandler();
 
+    private static final RequestHandler CONNECTOR_RESOURCE_HANDLER = new ConnectorResourceHandler();
+
     /**
      * TODO Document me!
      * 
@@ -189,8 +178,8 @@ public abstract class AbstractCommunicationManager implements Serializable {
     public AbstractCommunicationManager(Application application) {
         this.application = application;
         application.addRequestHandler(getBootstrapHandler());
-        application.addRequestHandler(APP_RESOURCE_HANDLER);
         application.addRequestHandler(UNSUPPORTED_BROWSER_HANDLER);
+        application.addRequestHandler(CONNECTOR_RESOURCE_HANDLER);
         requireLocale(application.getLocale().toString());
     }
 
@@ -1342,18 +1331,18 @@ public abstract class AbstractCommunicationManager implements Serializable {
     private void legacyPaint(PaintTarget paintTarget,
             ArrayList<ClientConnector> dirtyVisibleConnectors)
             throws PaintException {
-        List<Vaadin6Component> legacyComponents = new ArrayList<Vaadin6Component>();
+        List<LegacyComponent> legacyComponents = new ArrayList<LegacyComponent>();
         for (Connector connector : dirtyVisibleConnectors) {
             // All Components that want to use paintContent must implement
-            // Vaadin6Component
-            if (connector instanceof Vaadin6Component) {
-                legacyComponents.add((Vaadin6Component) connector);
+            // LegacyComponent
+            if (connector instanceof LegacyComponent) {
+                legacyComponents.add((LegacyComponent) connector);
             }
         }
         sortByHierarchy((List) legacyComponents);
-        for (Vaadin6Component c : legacyComponents) {
+        for (LegacyComponent c : legacyComponents) {
             getLogger().fine(
-                    "Painting Vaadin6Component " + c.getClass().getName() + "@"
+                    "Painting LegacyComponent " + c.getClass().getName() + "@"
                             + Integer.toHexString(c.hashCode()));
             paintTarget.startTag("change");
             final String pid = c.getConnectorId();
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java b/server/src/com/vaadin/server/AbstractDeploymentConfiguration.java
index 4052f5a400..d1280d29ce 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java
+++ b/server/src/com/vaadin/server/AbstractDeploymentConfiguration.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.lang.reflect.Constructor;
 import java.util.Iterator;
@@ -22,8 +22,6 @@ import java.util.Properties;
 import java.util.ServiceLoader;
 import java.util.logging.Logger;
 
-import com.vaadin.terminal.DeploymentConfiguration;
-
 public abstract class AbstractDeploymentConfiguration implements
         DeploymentConfiguration {
 
diff --git a/server/src/com/vaadin/terminal/AbstractErrorMessage.java b/server/src/com/vaadin/server/AbstractErrorMessage.java
index 808791158a..0928ea4bd4 100644
--- a/server/src/com/vaadin/terminal/AbstractErrorMessage.java
+++ b/server/src/com/vaadin/server/AbstractErrorMessage.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -23,7 +23,6 @@ import java.util.List;
 
 import com.vaadin.data.Buffered;
 import com.vaadin.data.Validator;
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
 
 /**
  * Base class for component error messages.
diff --git a/server/src/com/vaadin/terminal/AbstractExtension.java b/server/src/com/vaadin/server/AbstractExtension.java
index 8ac0ce01e3..747caee967 100644
--- a/server/src/com/vaadin/terminal/AbstractExtension.java
+++ b/server/src/com/vaadin/server/AbstractExtension.java
@@ -14,9 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
-
-import com.vaadin.terminal.gwt.server.ClientConnector;
+package com.vaadin.server;
 
 /**
  * An extension is an entity that is attached to a Component or another
diff --git a/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java b/server/src/com/vaadin/server/AbstractJavaScriptExtension.java
index 1def6df697..1f67631203 100644
--- a/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java
+++ b/server/src/com/vaadin/server/AbstractJavaScriptExtension.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import com.vaadin.shared.JavaScriptExtensionState;
 import com.vaadin.ui.JavaScriptFunction;
@@ -77,8 +77,7 @@ import com.vaadin.ui.JavaScriptFunction;
  * functions is described bellow.</li>
  * <li><code>translateVaadinUri(uri)</code> - Translates a Vaadin URI to a URL
  * that can be used in the browser. This is just way of accessing
- * {@link com.vaadin.terminal.gwt.client.ApplicationConnection#translateVaadinUri(String)}
- * </li>
+ * {@link com.vaadin.client.ApplicationConnection#translateVaadinUri(String)}</li>
  * </ul>
  * The connector wrapper also supports these special functions:
  * <ul>
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java b/server/src/com/vaadin/server/AbstractStreamingEvent.java
index ec2aa84947..39e43c725d 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java
+++ b/server/src/com/vaadin/server/AbstractStreamingEvent.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
-import com.vaadin.terminal.StreamVariable.StreamingEvent;
+import com.vaadin.server.StreamVariable.StreamingEvent;
 
 /**
  * Abstract base class for StreamingEvent implementations.
diff --git a/server/src/com/vaadin/terminal/AbstractUIProvider.java b/server/src/com/vaadin/server/AbstractUIProvider.java
index 5bb4d35b30..07b95fc713 100644
--- a/server/src/com/vaadin/terminal/AbstractUIProvider.java
+++ b/server/src/com/vaadin/server/AbstractUIProvider.java
@@ -14,7 +14,7 @@
  * the License.

  */

 

-package com.vaadin.terminal;

+package com.vaadin.server;

 

 import com.vaadin.Application;

 import com.vaadin.ui.UI;

@@ -22,8 +22,8 @@ import com.vaadin.ui.UI;
 public abstract class AbstractUIProvider implements UIProvider {

 

     @Override

-    public UI instantiateUI(Application application,

-            Class<? extends UI> type, WrappedRequest request) {

+    public UI instantiateUI(Application application, Class<? extends UI> type,

+            WrappedRequest request) {

         try {

             return type.newInstance();

         } catch (InstantiationException e) {

diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/server/src/com/vaadin/server/AbstractWebApplicationContext.java
index d857eeef4a..cf983f4c80 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
+++ b/server/src/com/vaadin/server/AbstractWebApplicationContext.java
@@ -13,14 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.PrintWriter;
 import java.io.Serializable;
 import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -35,8 +32,6 @@ import javax.servlet.http.HttpSessionBindingListener;
 
 import com.vaadin.Application;
 import com.vaadin.service.ApplicationContext;
-import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.ApplicationResource;
 
 /**
  * Base class for web application contexts (including portlet contexts) that
@@ -187,66 +182,6 @@ public abstract class AbstractWebApplicationContext implements
         applicationToAjaxAppMgrMap.remove(application);
     }
 
-    @Override
-    public String generateApplicationResourceURL(ApplicationResource resource,
-            String mapKey) {
-
-        final String filename = resource.getFilename();
-        if (filename == null) {
-            return ApplicationConstants.APP_PROTOCOL_PREFIX
-                    + ApplicationConstants.APP_REQUEST_PATH + mapKey + "/";
-        } else {
-            // #7738 At least Tomcat and JBoss refuses requests containing
-            // encoded slashes or backslashes in URLs. Application resource URLs
-            // should really be passed in another way than as part of the path
-            // in the future.
-            String encodedFileName = urlEncode(filename).replace("%2F", "/")
-                    .replace("%5C", "\\");
-            return ApplicationConstants.APP_PROTOCOL_PREFIX
-                    + ApplicationConstants.APP_REQUEST_PATH + mapKey + "/"
-                    + encodedFileName;
-        }
-
-    }
-
-    static String urlEncode(String filename) {
-        try {
-            return URLEncoder.encode(filename, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(
-                    "UTF-8 charset not available (\"this should never happen\")",
-                    e);
-        }
-    }
-
-    @Override
-    public boolean isApplicationResourceURL(URL context, String relativeUri) {
-        // If the relative uri is null, we are ready
-        if (relativeUri == null) {
-            return false;
-        }
-
-        // Resolves the prefix
-        String prefix = relativeUri;
-        final int index = relativeUri.indexOf('/');
-        if (index >= 0) {
-            prefix = relativeUri.substring(0, index);
-        }
-
-        // Handles the resource requests
-        return (prefix.equals("APP"));
-    }
-
-    @Override
-    public String getURLKey(URL context, String relativeUri) {
-        final int index = relativeUri.indexOf('/');
-        final int next = relativeUri.indexOf('/', index + 1);
-        if (next < 0) {
-            return null;
-        }
-        return relativeUri.substring(index + 1, next);
-    }
-
     /**
      * @return The total time spent servicing requests in this session.
      */
diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContext.java b/server/src/com/vaadin/server/AddonContext.java
index 2af22c560b..b3cd5ea226 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AddonContext.java
+++ b/server/src/com/vaadin/server/AddonContext.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -24,7 +24,6 @@ import java.util.ServiceLoader;
 
 import com.vaadin.Application;
 import com.vaadin.event.EventRouter;
-import com.vaadin.terminal.DeploymentConfiguration;
 import com.vaadin.tools.ReflectTools;
 
 /**
@@ -35,10 +34,10 @@ import com.vaadin.tools.ReflectTools;
  * <p>
  * By default, AddonContextListeners are loaded using {@link ServiceLoader},
  * which means that the file
- * META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener will be
- * checked for lines containing fully qualified names of classes to use. This
- * behavior can however be overridden for custom deployment situations (e.g. to
- * use CDI or OSGi) by overriding
+ * META-INF/services/com.vaadin.server.AddonContextListener will be checked for
+ * lines containing fully qualified names of classes to use. This behavior can
+ * however be overridden for custom deployment situations (e.g. to use CDI or
+ * OSGi) by overriding
  * {@link DeploymentConfiguration#getAddonContextListeners()}.
  * 
  * @author Vaadin Ltd
diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java b/server/src/com/vaadin/server/AddonContextEvent.java
index 0f3900fa20..d83b1b0084 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java
+++ b/server/src/com/vaadin/server/AddonContextEvent.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.EventObject;
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java b/server/src/com/vaadin/server/AddonContextListener.java
index b76d233716..a5d9e8c5c9 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java
+++ b/server/src/com/vaadin/server/AddonContextListener.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.EventListener;
 
@@ -22,8 +22,7 @@ import java.util.EventListener;
  * Listener that gets notified then the {@link AddonContext} is initialized,
  * allowing an add-on to add listeners to various parts of the framework. In a
  * default configuration, add-ons can register their listeners by including a
- * file named
- * META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener
+ * file named META-INF/services/com.vaadin.server.AddonContextListener
  * containing the fully qualified class names of classes implementing this
  * interface.
  * 
diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationPortlet2.java b/server/src/com/vaadin/server/ApplicationPortlet2.java
index 743670438e..3708d8fe0d 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ApplicationPortlet2.java
+++ b/server/src/com/vaadin/server/ApplicationPortlet2.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException;
+import com.vaadin.server.ServletPortletHelper.ApplicationClassException;
 
 /**
  * TODO Write documentation, fix JavaDoc tags.
diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java b/server/src/com/vaadin/server/ApplicationServlet.java
index 857c7c738c..af0cebcf86 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
+++ b/server/src/com/vaadin/server/ApplicationServlet.java
@@ -14,14 +14,13 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.DefaultUIProvider;
-import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException;
+import com.vaadin.server.ServletPortletHelper.ApplicationClassException;
 
 /**
  * This servlet connects a Vaadin Application to Web.
diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java b/server/src/com/vaadin/server/ApplicationStartedEvent.java
index 02d73884f5..d06744ae40 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java
+++ b/server/src/com/vaadin/server/ApplicationStartedEvent.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.EventObject;
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java b/server/src/com/vaadin/server/ApplicationStartedListener.java
index c6976aee57..c54132d875 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java
+++ b/server/src/com/vaadin/server/ApplicationStartedListener.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.EventListener;
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapDom.java b/server/src/com/vaadin/server/BootstrapDom.java
index 15210a7de5..65ee9f2761 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapDom.java
+++ b/server/src/com/vaadin/server/BootstrapDom.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 public class BootstrapDom {
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java b/server/src/com/vaadin/server/BootstrapFragmentResponse.java
index 6f69086523..16f7bc653b 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java
+++ b/server/src/com/vaadin/server/BootstrapFragmentResponse.java
@@ -14,14 +14,13 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.List;
 
 import org.jsoup.nodes.Node;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.WrappedRequest;
 
 /**
  * A representation of a bootstrap fragment being generated. The bootstrap
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java
index 02005e8d22..280372a5e5 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
+++ b/server/src/com/vaadin/server/BootstrapHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -43,11 +43,6 @@ import com.vaadin.external.json.JSONObject;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.Version;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
 import com.vaadin.ui.UI;
 
 public abstract class BootstrapHandler implements RequestHandler {
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java b/server/src/com/vaadin/server/BootstrapListener.java
index d99d5b7b84..9b68df3d51 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java
+++ b/server/src/com/vaadin/server/BootstrapListener.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.EventListener;
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java b/server/src/com/vaadin/server/BootstrapPageResponse.java
index 847578ef97..d6df145728 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java
+++ b/server/src/com/vaadin/server/BootstrapPageResponse.java
@@ -14,15 +14,13 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.Map;
 
 import org.jsoup.nodes.Document;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
 
 /**
  * A representation of a bootstrap page being generated. The bootstrap page
@@ -52,8 +50,7 @@ public class BootstrapPageResponse extends BootstrapResponse {
      *            the application for which the bootstrap page should be
      *            generated
      * @param uiId
-     *            the generated id of the UI that will be displayed on the
-     *            page
+     *            the generated id of the UI that will be displayed on the page
      * @param document
      *            the DOM document making up the HTML page
      * @param headers
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java b/server/src/com/vaadin/server/BootstrapResponse.java
index a422cba345..962b48dc31 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java
+++ b/server/src/com/vaadin/server/BootstrapResponse.java
@@ -14,13 +14,12 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.EventObject;
 
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/server/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java b/server/src/com/vaadin/server/ChangeVariablesErrorEvent.java
index cb0645d94f..f208fffcef 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java
+++ b/server/src/com/vaadin/server/ChangeVariablesErrorEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.Map;
 
diff --git a/server/src/com/vaadin/terminal/ClassResource.java b/server/src/com/vaadin/server/ClassResource.java
index e4921f2413..2f05115fd4 100644
--- a/server/src/com/vaadin/terminal/ClassResource.java
+++ b/server/src/com/vaadin/server/ClassResource.java
@@ -14,12 +14,14 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
 import com.vaadin.Application;
 import com.vaadin.service.FileTypeResolver;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.UI.LegacyWindow;
 
 /**
  * <code>ClassResource</code> is a named resource accessed with the class
@@ -33,7 +35,7 @@ import com.vaadin.service.FileTypeResolver;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class ClassResource implements ApplicationResource, Serializable {
+public class ClassResource implements ConnectorResource, Serializable {
 
     /**
      * Default buffer size for this stream resource.
@@ -43,10 +45,10 @@ public class ClassResource implements ApplicationResource, Serializable {
     /**
      * Default cache time for this stream resource.
      */
-    private long cacheTime = DEFAULT_CACHETIME;
+    private long cacheTime = DownloadStream.DEFAULT_CACHETIME;
 
     /**
-     * Associated class used for indetifying the source of the resource.
+     * Associated class used for identifying the source of the resource.
      */
     private final Class<?> associatedClass;
 
@@ -56,21 +58,15 @@ public class ClassResource implements ApplicationResource, Serializable {
     private final String resourceName;
 
     /**
-     * Application used for serving the class.
-     */
-    private final Application application;
-
-    /**
      * Creates a new application resource instance. The resource id is relative
-     * to the location of the application class.
+     * to the location of the UI of the component using this resource (or the
+     * Application if using LegacyWindow).
      * 
      * @param resourceName
      *            the Unique identifier of the resource within the application.
-     * @param application
-     *            the application this resource will be added to.
      */
-    public ClassResource(String resourceName, Application application) {
-        this(application.getClass(), resourceName, application);
+    public ClassResource(String resourceName) {
+        this(null, resourceName);
     }
 
     /**
@@ -80,74 +76,62 @@ public class ClassResource implements ApplicationResource, Serializable {
      *            the class of the which the resource is associated.
      * @param resourceName
      *            the Unique identifier of the resource within the application.
-     * @param application
-     *            the application this resource will be added to.
      */
-    public ClassResource(Class<?> associatedClass, String resourceName,
-            Application application) {
+    public ClassResource(Class<?> associatedClass, String resourceName) {
         this.associatedClass = associatedClass;
         this.resourceName = resourceName;
-        this.application = application;
-        if (resourceName == null || associatedClass == null) {
+        if (resourceName == null) {
             throw new NullPointerException();
         }
-        application.addResource(this);
     }
 
     /**
      * Gets the MIME type of this resource.
      * 
-     * @see com.vaadin.terminal.Resource#getMIMEType()
+     * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
     public String getMIMEType() {
         return FileTypeResolver.getMIMEType(resourceName);
     }
 
-    /**
-     * Gets the application of this resource.
-     * 
-     * @see com.vaadin.terminal.ApplicationResource#getApplication()
-     */
-    @Override
-    public Application getApplication() {
-        return application;
-    }
-
-    /**
-     * Gets the virtual filename for this resource.
-     * 
-     * @return the file name associated to this resource.
-     * @see com.vaadin.terminal.ApplicationResource#getFilename()
-     */
     @Override
     public String getFilename() {
-        int index = 0;
-        int next = 0;
-        while ((next = resourceName.indexOf('/', index)) > 0
-                && next + 1 < resourceName.length()) {
-            index = next + 1;
-        }
-        return resourceName.substring(index);
+        String[] parts = resourceName.split("/");
+        return parts[parts.length - 1];
     }
 
-    /**
-     * Gets resource as stream.
-     * 
-     * @see com.vaadin.terminal.ApplicationResource#getStream()
-     */
     @Override
     public DownloadStream getStream() {
-        final DownloadStream ds = new DownloadStream(
-                associatedClass.getResourceAsStream(resourceName),
-                getMIMEType(), getFilename());
+        final DownloadStream ds = new DownloadStream(getAssociatedClass()
+                .getResourceAsStream(resourceName), getMIMEType(),
+                getFilename());
         ds.setBufferSize(getBufferSize());
-        ds.setCacheTime(cacheTime);
+        ds.setCacheTime(getCacheTime());
         return ds;
     }
 
-    /* documented in superclass */
-    @Override
+    protected Class<?> getAssociatedClass() {
+        if (associatedClass == null) {
+            Class<? extends UI> associatedClass = UI.getCurrent().getClass();
+            if (associatedClass == LegacyWindow.class) {
+                return Application.getCurrent().getClass();
+            }
+            return associatedClass;
+        }
+        return associatedClass;
+    }
+
+    /**
+     * Gets the size of the download buffer used for this resource.
+     * 
+     * <p>
+     * If the buffer size is 0, the buffer size is decided by the terminal
+     * adapter. The default value is 0.
+     * </p>
+     * 
+     * @return the size of the buffer in bytes.
+     */
     public int getBufferSize() {
         return bufferSize;
     }
@@ -157,13 +141,24 @@ public class ClassResource implements ApplicationResource, Serializable {
      * 
      * @param bufferSize
      *            the size of the buffer in bytes.
+     * 
+     * @see #getBufferSize()
      */
     public void setBufferSize(int bufferSize) {
         this.bufferSize = bufferSize;
     }
 
-    /* documented in superclass */
-    @Override
+    /**
+     * Gets the length of cache expiration time.
+     * 
+     * <p>
+     * This gives the adapter the possibility cache streams sent to the client.
+     * The caching may be made in adapter or at the client if the client
+     * supports caching. Default is {@link DownloadStream#DEFAULT_CACHETIME}.
+     * </p>
+     * 
+     * @return Cache time in milliseconds
+     */
     public long getCacheTime() {
         return cacheTime;
     }
@@ -174,7 +169,7 @@ public class ClassResource implements ApplicationResource, Serializable {
      * <p>
      * This gives the adapter the possibility cache streams sent to the client.
      * The caching may be made in adapter or at the client if the client
-     * supports caching. Zero or negavive value disbales the caching of this
+     * supports caching. Zero or negative value disables the caching of this
      * stream.
      * </p>
      * 
diff --git a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java b/server/src/com/vaadin/server/ClientConnector.java
index c2fbbe37d4..3a340c2d7d 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java
+++ b/server/src/com/vaadin/server/ClientConnector.java
@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
+import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
@@ -22,8 +23,6 @@ import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.communication.SharedState;
-import com.vaadin.terminal.AbstractClientConnector;
-import com.vaadin.terminal.Extension;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.UI;
@@ -213,4 +212,30 @@ public interface ClientConnector extends Connector, RpcTarget {
      *             if the state can not be encoded
      */
     public JSONObject encodeState() throws JSONException;
+
+    /**
+     * Handle a request directed to this connector. This can be used by
+     * connectors to dynamically generate a response and it is also used
+     * internally when serving {@link ConnectorResource}s.
+     * <p>
+     * Requests to <code>/APP/connector/[ui id]/[connector id]/</code> are
+     * routed to this method with the remaining part of the requested path
+     * available in the path parameter.
+     * <p>
+     * {@link DynamicConnectorResource} can be used to easily make an
+     * appropriate URL available to the client-side code.
+     * 
+     * @param request
+     *            the request that should be handled
+     * @param response
+     *            the response object to which the response should be written
+     * @param path
+     *            the requested relative path
+     * @return <code>true</code> if the request has been handled,
+     *         <code>false</code> if no response has been written.
+     * @throws IOException
+     *             if there is a problem generating a response.
+     */
+    public boolean handleConnectorRequest(WrappedRequest request,
+            WrappedResponse response, String path) throws IOException;
 }
diff --git a/server/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java b/server/src/com/vaadin/server/ClientMethodInvocation.java
index 7cc5159bc0..1533222b3a 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java
+++ b/server/src/com/vaadin/server/ClientMethodInvocation.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
diff --git a/server/src/com/vaadin/terminal/CombinedRequest.java b/server/src/com/vaadin/server/CombinedRequest.java
index 3d6c3c2149..c186fcc87c 100644
--- a/server/src/com/vaadin/terminal/CombinedRequest.java
+++ b/server/src/com/vaadin/server/CombinedRequest.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,8 +28,6 @@ import com.vaadin.Application;
 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
-import com.vaadin.terminal.gwt.server.WebBrowser;
 
 /**
  * A {@link WrappedRequest} with path and parameters from one request and
diff --git a/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/server/src/com/vaadin/server/CommunicationManager.java
index 7551e849a1..9b56e20fd4 100644
--- a/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
+++ b/server/src/com/vaadin/server/CommunicationManager.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.InputStream;
 import java.net.URL;
@@ -23,8 +23,6 @@ import javax.servlet.ServletContext;
 
 import com.vaadin.Application;
 import com.vaadin.external.json.JSONException;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java b/server/src/com/vaadin/server/ComponentSizeValidator.java
index 2349be1974..08fa150a9d 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
+++ b/server/src/com/vaadin/server/ComponentSizeValidator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -28,7 +28,7 @@ import java.util.Vector;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.terminal.Sizeable.Unit;
+import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.AbstractSplitPanel;
 import com.vaadin.ui.Component;
diff --git a/server/src/com/vaadin/terminal/CompositeErrorMessage.java b/server/src/com/vaadin/server/CompositeErrorMessage.java
index e86102ae3b..f51ba559eb 100644
--- a/server/src/com/vaadin/terminal/CompositeErrorMessage.java
+++ b/server/src/com/vaadin/server/CompositeErrorMessage.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/server/src/com/vaadin/server/ConnectorResource.java b/server/src/com/vaadin/server/ConnectorResource.java
new file mode 100644
index 0000000000..e696c35c0d
--- /dev/null
+++ b/server/src/com/vaadin/server/ConnectorResource.java
@@ -0,0 +1,42 @@
+/*
+ * 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.server;
+
+/**
+ * A resource that is served through the Connector that is using the resource.
+ * 
+ * @see AbstractClientConnector#setResource(String, Resource)
+ * 
+ * @author Vaadin Ltd
+ * @version @VERSION@
+ * @since 7.0.0
+ */
+public interface ConnectorResource extends Resource {
+    public static final String CONNECTOR_REQUEST_PATH = "connector/";
+
+    /**
+     * Gets resource as stream.
+     */
+    public DownloadStream getStream();
+
+    /**
+     * Gets the virtual filename for this resource.
+     * 
+     * @return the file name associated to this resource.
+     */
+    public String getFilename();
+}
diff --git a/server/src/com/vaadin/server/ConnectorResourceHandler.java b/server/src/com/vaadin/server/ConnectorResourceHandler.java
new file mode 100644
index 0000000000..b988510b8e
--- /dev/null
+++ b/server/src/com/vaadin/server/ConnectorResourceHandler.java
@@ -0,0 +1,81 @@
+package com.vaadin.server;
+
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.vaadin.Application;
+import com.vaadin.shared.ApplicationConstants;
+import com.vaadin.ui.UI;
+
+public class ConnectorResourceHandler implements RequestHandler {
+    // APP/connector/[uiid]/[cid]/[filename.xyz]
+    private static final Pattern CONNECTOR_RESOURCE_PATTERN = Pattern
+            .compile("^/?" + ApplicationConstants.APP_REQUEST_PATH
+                    + ConnectorResource.CONNECTOR_REQUEST_PATH
+                    + "(\\d+)/(\\d+)/(.*)");
+
+    private static Logger getLogger() {
+        return Logger.getLogger(ConnectorResourceHandler.class.getName());
+
+    }
+
+    @Override
+    public boolean handleRequest(Application application,
+            WrappedRequest request, WrappedResponse response)
+            throws IOException {
+        String requestPath = request.getRequestPathInfo();
+        if (requestPath == null) {
+            return false;
+        }
+        Matcher matcher = CONNECTOR_RESOURCE_PATTERN.matcher(requestPath);
+        if (matcher.matches()) {
+            String uiId = matcher.group(1);
+            String cid = matcher.group(2);
+            String key = matcher.group(3);
+            UI ui = application.getUIById(Integer.parseInt(uiId));
+            if (ui == null) {
+                return error(request, response,
+                        "Ignoring connector request for no-existent root "
+                                + uiId);
+            }
+
+            UI.setCurrent(ui);
+            Application.setCurrent(ui.getApplication());
+
+            ClientConnector connector = ui.getConnectorTracker().getConnector(
+                    cid);
+            if (connector == null) {
+                return error(request, response,
+                        "Ignoring connector request for no-existent connector "
+                                + cid + " in root " + uiId);
+            }
+
+            if (!connector.handleConnectorRequest(request, response, key)) {
+                return error(request, response, connector.getClass()
+                        .getSimpleName()
+                        + " ("
+                        + connector.getConnectorId()
+                        + ") did not handle connector request for " + key);
+            }
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private static boolean error(WrappedRequest request,
+            WrappedResponse response, String logMessage) throws IOException {
+        getLogger().log(Level.WARNING, logMessage);
+        response.sendError(HttpServletResponse.SC_NOT_FOUND,
+                request.getRequestPathInfo() + " can not be found");
+
+        // Request handled (though not in a nice way)
+        return true;
+    }
+}
diff --git a/server/src/com/vaadin/terminal/gwt/server/Constants.java b/server/src/com/vaadin/server/Constants.java
index 9640216488..afb2d4dae1 100644
--- a/server/src/com/vaadin/terminal/gwt/server/Constants.java
+++ b/server/src/com/vaadin/server/Constants.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 /**
  * TODO Document me!
@@ -81,7 +81,7 @@ public interface Constants {
     static final String WIDGETSET_DIRECTORY_PATH = "VAADIN/widgetsets/";
 
     // Name of the default widget set, used if not specified in web.xml
-    static final String DEFAULT_WIDGETSET = "com.vaadin.terminal.gwt.DefaultWidgetSet";
+    static final String DEFAULT_WIDGETSET = "com.vaadin.DefaultWidgetSet";
 
     // Widget set parameter name
     static final String PARAMETER_WIDGETSET = "widgetset";
diff --git a/server/src/com/vaadin/terminal/DefaultUIProvider.java b/server/src/com/vaadin/server/DefaultUIProvider.java
index 8713c45b31..913402c89f 100644
--- a/server/src/com/vaadin/terminal/DefaultUIProvider.java
+++ b/server/src/com/vaadin/server/DefaultUIProvider.java
@@ -14,7 +14,7 @@
  * the License.

  */

 

-package com.vaadin.terminal;

+package com.vaadin.server;

 

 import com.vaadin.Application;

 import com.vaadin.UIRequiresMoreInformationException;

diff --git a/server/src/com/vaadin/terminal/DeploymentConfiguration.java b/server/src/com/vaadin/server/DeploymentConfiguration.java
index 0cfbdb7544..d1cbdfc499 100644
--- a/server/src/com/vaadin/terminal/DeploymentConfiguration.java
+++ b/server/src/com/vaadin/server/DeploymentConfiguration.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.util.Iterator;
@@ -24,8 +24,6 @@ import javax.portlet.PortletContext;
 import javax.servlet.ServletContext;
 
 import com.vaadin.service.ApplicationContext;
-import com.vaadin.terminal.gwt.server.AddonContext;
-import com.vaadin.terminal.gwt.server.AddonContextListener;
 
 /**
  * Provide deployment specific settings that are required outside terminal
diff --git a/server/src/com/vaadin/terminal/DownloadStream.java b/server/src/com/vaadin/server/DownloadStream.java
index 30810d5da4..0c00f96832 100644
--- a/server/src/com/vaadin/terminal/DownloadStream.java
+++ b/server/src/com/vaadin/server/DownloadStream.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,8 +26,6 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.vaadin.terminal.gwt.server.Constants;
-
 /**
  * Downloadable stream.
  * 
@@ -232,14 +230,18 @@ public class DownloadStream implements Serializable {
      * redirect (302 Moved temporarily) is sent instead of the contents of this
      * stream.
      * 
+     * @param request
+     *            the request for which the response should be written
      * @param response
      *            the wrapped response to write this download stream to
+     * 
      * @throws IOException
      *             passed through from the wrapped response
      * 
      * @since 7.0
      */
-    public void writeTo(WrappedResponse response) throws IOException {
+    public void writeResponse(WrappedRequest request, WrappedResponse response)
+            throws IOException {
         if (getParameter("Location") != null) {
             response.setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY);
             response.setHeader("Location", getParameter("Location"));
diff --git a/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/server/src/com/vaadin/server/DragAndDropService.java
index 0106f466fc..3e7de5c9a2 100644
--- a/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
+++ b/server/src/com/vaadin/server/DragAndDropService.java
@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
+import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.Collections;
@@ -36,9 +37,6 @@ import com.vaadin.external.json.JSONObject;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.communication.SharedState;
 import com.vaadin.shared.ui.dd.DragEventType;
-import com.vaadin.terminal.Extension;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.VariableOwner;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.UI;
 
@@ -341,4 +339,10 @@ public class DragAndDropService implements VariableOwner, ClientConnector {
         // TODO Auto-generated method stub
         return null;
     }
+
+    @Override
+    public boolean handleConnectorRequest(WrappedRequest request,
+            WrappedResponse response, String path) throws IOException {
+        return false;
+    }
 }
diff --git a/server/src/com/vaadin/server/DynamicConnectorResource.java b/server/src/com/vaadin/server/DynamicConnectorResource.java
new file mode 100644
index 0000000000..8269f261f7
--- /dev/null
+++ b/server/src/com/vaadin/server/DynamicConnectorResource.java
@@ -0,0 +1,95 @@
+/*
+ * 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.server;
+
+import java.util.Collections;
+import java.util.Map;
+
+import com.vaadin.service.FileTypeResolver;
+
+/**
+ * A resource that is served by calling
+ * {@link ClientConnector#handleConnectorRequest(WrappedRequest, WrappedResponse, String)}
+ * with appropriate parameters.
+ * 
+ * @author Vaadin Ltd
+ * @version @VERSION@
+ * @since 7.0.0
+ */
+public class DynamicConnectorResource implements Resource {
+
+    private final ClientConnector connector;
+    private final String path;
+    private final Map<String, String> parameters;
+
+    /**
+     * Creates a DynamicConnectorResoruce for the given connector that will be
+     * served by calling
+     * {@link ClientConnector#handleConnectorRequest(WrappedRequest, WrappedResponse, String)}
+     * with the given path.
+     * 
+     * @param connector
+     *            the connector that should serve the resource
+     * @param path
+     *            the relative path of the request
+     */
+    public DynamicConnectorResource(ClientConnector connector, String path) {
+        this(connector, path, null);
+    }
+
+    /**
+     * Creates a DynamicConnectorResoruce for the given connector that will be
+     * served by calling
+     * {@link ClientConnector#handleConnectorRequest(WrappedRequest, WrappedResponse, String)}
+     * with the given path and the given request parameters.
+     * 
+     * @param connector
+     *            the connector that should serve the resource
+     * @param path
+     *            the relative path of the request
+     * @param parameters
+     *            the parameters that should be present in the request
+     */
+    public DynamicConnectorResource(ClientConnector connector, String path,
+            Map<String, String> parameters) {
+        this.connector = connector;
+        this.path = path;
+        this.parameters = parameters;
+    }
+
+    @Override
+    public String getMIMEType() {
+        return FileTypeResolver.getMIMEType(path);
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public ClientConnector getConnector() {
+        return connector;
+    }
+
+    public Map<String, String> getParameters() {
+        if (parameters == null) {
+            return Collections.emptyMap();
+        } else {
+            return Collections.unmodifiableMap(parameters);
+        }
+    }
+
+}
diff --git a/server/src/com/vaadin/terminal/gwt/server/EncodeResult.java b/server/src/com/vaadin/server/EncodeResult.java
index a62df2e632..f58c0b4810 100644
--- a/server/src/com/vaadin/terminal/gwt/server/EncodeResult.java
+++ b/server/src/com/vaadin/server/EncodeResult.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 public class EncodeResult {
     private final Object encodedValue;
diff --git a/server/src/com/vaadin/terminal/ErrorMessage.java b/server/src/com/vaadin/server/ErrorMessage.java
index 15273efb6f..fcc481e826 100644
--- a/server/src/com/vaadin/terminal/ErrorMessage.java
+++ b/server/src/com/vaadin/server/ErrorMessage.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/Extension.java b/server/src/com/vaadin/server/Extension.java
index 87901c3c13..bb7d133e8e 100644
--- a/server/src/com/vaadin/terminal/Extension.java
+++ b/server/src/com/vaadin/server/Extension.java
@@ -14,9 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
-
-import com.vaadin.terminal.gwt.server.ClientConnector;
+package com.vaadin.server;
 
 /**
  * An extension is an entity that is attached to a Component or another
diff --git a/server/src/com/vaadin/terminal/ExternalResource.java b/server/src/com/vaadin/server/ExternalResource.java
index d970c0934b..925b0589f3 100644
--- a/server/src/com/vaadin/terminal/ExternalResource.java
+++ b/server/src/com/vaadin/server/ExternalResource.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.net.URL;
@@ -108,7 +108,7 @@ public class ExternalResource implements Resource, Serializable {
     /**
      * Gets the MIME type of the resource.
      * 
-     * @see com.vaadin.terminal.Resource#getMIMEType()
+     * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
     public String getMIMEType() {
diff --git a/server/src/com/vaadin/terminal/FileResource.java b/server/src/com/vaadin/server/FileResource.java
index ab8bc95ce3..fbf353362e 100644
--- a/server/src/com/vaadin/terminal/FileResource.java
+++ b/server/src/com/vaadin/server/FileResource.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
 import com.vaadin.Application;
+import com.vaadin.server.Terminal.ErrorEvent;
 import com.vaadin.service.FileTypeResolver;
-import com.vaadin.terminal.Terminal.ErrorEvent;
 
 /**
  * <code>FileResources</code> are files or directories on local filesystem. The
@@ -34,7 +34,7 @@ import com.vaadin.terminal.Terminal.ErrorEvent;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class FileResource implements ApplicationResource {
+public class FileResource implements ConnectorResource {
 
     /**
      * Default buffer size for this stream resource.
@@ -47,11 +47,6 @@ public class FileResource implements ApplicationResource {
     private File sourceFile;
 
     /**
-     * Application.
-     */
-    private final Application application;
-
-    /**
      * Default cache time for this stream resource.
      */
     private long cacheTime = DownloadStream.DEFAULT_CACHETIME;
@@ -59,18 +54,14 @@ public class FileResource implements ApplicationResource {
     /**
      * Creates a new file resource for providing given file for client
      * terminals.
+     * 
+     * @param sourceFile
+     *            the file that should be served.
      */
-    public FileResource(File sourceFile, Application application) {
-        this.application = application;
+    public FileResource(File sourceFile) {
         setSourceFile(sourceFile);
-        application.addResource(this);
     }
 
-    /**
-     * Gets the resource as stream.
-     * 
-     * @see com.vaadin.terminal.ApplicationResource#getStream()
-     */
     @Override
     public DownloadStream getStream() {
         try {
@@ -83,14 +74,15 @@ public class FileResource implements ApplicationResource {
             return ds;
         } catch (final FileNotFoundException e) {
             // Log the exception using the application error handler
-            getApplication().getErrorHandler().terminalError(new ErrorEvent() {
+            Application.getCurrent().getErrorHandler()
+                    .terminalError(new ErrorEvent() {
 
-                @Override
-                public Throwable getThrowable() {
-                    return e;
-                }
+                        @Override
+                        public Throwable getThrowable() {
+                            return e;
+                        }
 
-            });
+                    });
 
             return null;
         }
@@ -111,29 +103,15 @@ public class FileResource implements ApplicationResource {
      * @param sourceFile
      *            the source file to set.
      */
-    public void setSourceFile(File sourceFile) {
+    private void setSourceFile(File sourceFile) {
         this.sourceFile = sourceFile;
     }
 
-    /**
-     * @see com.vaadin.terminal.ApplicationResource#getApplication()
-     */
-    @Override
-    public Application getApplication() {
-        return application;
-    }
-
-    /**
-     * @see com.vaadin.terminal.ApplicationResource#getFilename()
-     */
     @Override
     public String getFilename() {
         return sourceFile.getName();
     }
 
-    /**
-     * @see com.vaadin.terminal.Resource#getMIMEType()
-     */
     @Override
     public String getMIMEType() {
         return FileTypeResolver.getMIMEType(sourceFile);
@@ -147,7 +125,6 @@ public class FileResource implements ApplicationResource {
      * 
      * @return Cache time in milliseconds.
      */
-    @Override
     public long getCacheTime() {
         return cacheTime;
     }
@@ -165,8 +142,16 @@ public class FileResource implements ApplicationResource {
         this.cacheTime = cacheTime;
     }
 
-    /* documented in superclass */
-    @Override
+    /**
+     * Gets the size of the download buffer used for this resource.
+     * 
+     * <p>
+     * If the buffer size is 0, the buffer size is decided by the terminal
+     * adapter. The default value is 0.
+     * </p>
+     * 
+     * @return the size of the buffer in bytes.
+     */
     public int getBufferSize() {
         return bufferSize;
     }
diff --git a/server/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java b/server/src/com/vaadin/server/GAEApplicationServlet.java
index fe3d384c5c..16345edead 100644
--- a/server/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java
+++ b/server/src/com/vaadin/server/GAEApplicationServlet.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -56,7 +56,7 @@ import com.vaadin.service.ApplicationContext;
  * <pre>
  *      &lt;servlet&gt;
  *              &lt;servlet-name&gt;HelloWorld&lt;/servlet-name&gt;
- *              &lt;servlet-class&gt;com.vaadin.terminal.gwt.server.GAEApplicationServlet&lt;/servlet-class&gt;
+ *              &lt;servlet-class&gt;com.vaadin.server.GAEApplicationServlet&lt;/servlet-class&gt;
  *              &lt;init-param&gt;
  *                      &lt;param-name&gt;application&lt;/param-name&gt;
  *                      &lt;param-value&gt;com.vaadin.demo.HelloWorld&lt;/param-value&gt;
diff --git a/server/src/com/vaadin/server/GlobalResourceHandler.java b/server/src/com/vaadin/server/GlobalResourceHandler.java
new file mode 100644
index 0000000000..f3a72a0efc
--- /dev/null
+++ b/server/src/com/vaadin/server/GlobalResourceHandler.java
@@ -0,0 +1,239 @@
+/*
+ * 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.server;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.vaadin.Application;
+import com.vaadin.shared.ApplicationConstants;
+import com.vaadin.ui.UI;
+
+/**
+ * A {@link RequestHandler} that takes care of {@link ConnectorResource}s that
+ * should not be served by the connector.
+ * 
+ * @author Vaadin Ltd
+ * @version @VERSION@
+ * @since 7.0.0
+ */
+public class GlobalResourceHandler implements RequestHandler {
+    private static final String LEGACY_TYPE = "legacy";
+
+    private static final String RESOURCE_REQUEST_PATH = "global/";
+
+    /**
+     * Used to detect when a resource is no longer used by any connector.
+     */
+    private final Map<Resource, Set<ClientConnector>> resourceUsers = new HashMap<Resource, Set<ClientConnector>>();
+    /**
+     * Used to find the resources that might not be needed any more when a
+     * connector is unregistered.
+     */
+    private final Map<ClientConnector, Set<Resource>> usedResources = new HashMap<ClientConnector, Set<Resource>>();
+
+    private final Map<ConnectorResource, String> legacyResourceKeys = new HashMap<ConnectorResource, String>();
+    private final Map<String, ConnectorResource> legacyResources = new HashMap<String, ConnectorResource>();
+    private int nextLegacyId = 0;
+
+    // APP/global/[uiid]/[type]/[id]
+    private final Matcher matcher = Pattern.compile(
+            "^/?" + ApplicationConstants.APP_REQUEST_PATH
+                    + RESOURCE_REQUEST_PATH + "(\\d+)/(([^/]+)(/.*))").matcher(
+            "");
+
+    @Override
+    public boolean handleRequest(Application application,
+            WrappedRequest request, WrappedResponse response)
+            throws IOException {
+        String pathInfo = request.getRequestPathInfo();
+        if (pathInfo == null) {
+            return false;
+        }
+
+        matcher.reset(pathInfo);
+        if (!matcher.matches()) {
+            return false;
+        }
+
+        String uiid = matcher.group(1);
+        String type = matcher.group(3);
+        String key = matcher.group(2);
+
+        // Allow GCing pathInfo string
+        matcher.reset();
+
+        if (key == null) {
+            return error(request, response, pathInfo
+                    + " is not a valid global resource path");
+        }
+
+        UI ui = application.getUIById(Integer.parseInt(uiid));
+        if (ui == null) {
+            return error(request, response, "No UI found for id  " + uiid);
+        }
+        UI.setCurrent(ui);
+
+        ConnectorResource resource;
+        if (LEGACY_TYPE.equals(type)) {
+            resource = legacyResources.get(key);
+        } else {
+            return error(request, response, "Unknown global resource type "
+                    + type + " in requested path " + pathInfo);
+        }
+
+        if (resource == null) {
+            return error(request, response, "Global resource " + key
+                    + " not found");
+        }
+
+        DownloadStream stream = resource.getStream();
+        if (stream == null) {
+            return error(request, response, "Resource " + resource
+                    + " didn't produce any stream.");
+        }
+
+        stream.writeResponse(request, response);
+        return true;
+    }
+
+    /**
+     * Registers a resource to be served with a global URL.
+     * <p>
+     * A {@link ConnectorResource} registered for a {@link Vaadin6Component}
+     * will be set to be served with a global URL. Other resource types will be
+     * ignored and thus not served by this handler.
+     * 
+     * @param resource
+     *            the resource to register
+     * @param ownerConnector
+     *            the connector to which the resource belongs
+     */
+    public void register(Resource resource, ClientConnector ownerConnector) {
+        if (resource instanceof ConnectorResource) {
+            if (!(ownerConnector instanceof LegacyComponent)) {
+                throw new IllegalArgumentException(
+                        "A normal ConnectorResource can only be registered for legacy components.");
+            }
+            ConnectorResource connectorResource = (ConnectorResource) resource;
+            if (!legacyResourceKeys.containsKey(resource)) {
+                String uri = LEGACY_TYPE + '/'
+                        + Integer.toString(nextLegacyId++);
+                String filename = connectorResource.getFilename();
+                if (filename != null && !filename.isEmpty()) {
+                    uri += '/' + filename;
+                }
+                legacyResourceKeys.put(connectorResource, uri);
+                legacyResources.put(uri, connectorResource);
+                registerResourceUsage(connectorResource, ownerConnector);
+            }
+        }
+    }
+
+    private void unregisterResource(Resource resource) {
+        String oldUri = legacyResourceKeys.remove(resource);
+        if (oldUri != null) {
+            legacyResources.remove(oldUri);
+        }
+    }
+
+    private void registerResourceUsage(Resource resource,
+            ClientConnector connector) {
+        ensureInSet(resourceUsers, resource, connector);
+        ensureInSet(usedResources, connector, resource);
+    }
+
+    private <K, V> void ensureInSet(Map<K, Set<V>> map, K key, V value) {
+        Set<V> set = map.get(key);
+        if (set == null) {
+            set = new HashSet<V>();
+            map.put(key, set);
+        }
+        set.add(value);
+    }
+
+    /**
+     * Gets a global URI for a resource if it's registered with this handler.
+     * 
+     * @param connector
+     *            the connector for which the uri should be generated.
+     * @param resource
+     *            the resource for which the uri should be generated.
+     * @return an URI string, or <code>null</code> if the resource is not
+     *         registered.
+     */
+    public String getUri(ClientConnector connector, ConnectorResource resource) {
+        // app://APP/global/[ui]/[type]/[id]
+        String uri = legacyResourceKeys.get(resource);
+        if (uri != null && !uri.isEmpty()) {
+            return ApplicationConstants.APP_PROTOCOL_PREFIX
+                    + ApplicationConstants.APP_REQUEST_PATH
+                    + RESOURCE_REQUEST_PATH + connector.getUI().getUIId() + '/'
+                    + uri;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Notifies this handler that resources registered for the given connector
+     * can be released.
+     * 
+     * @param connector
+     *            the connector for which any registered resources can be
+     *            released.
+     */
+    public void unregisterConnector(ClientConnector connector) {
+        Set<Resource> set = usedResources.remove(connector);
+        if (set == null) {
+            return;
+        }
+
+        for (Resource resource : set) {
+            Set<ClientConnector> users = resourceUsers.get(resource);
+            users.remove(connector);
+            if (users.isEmpty()) {
+                resourceUsers.remove(resource);
+                unregisterResource(resource);
+            }
+        }
+    }
+
+    private static Logger getLogger() {
+        return Logger.getLogger(GlobalResourceHandler.class.getName());
+    }
+
+    private static boolean error(WrappedRequest request,
+            WrappedResponse response, String logMessage) throws IOException {
+        getLogger().log(Level.WARNING, logMessage);
+        response.sendError(HttpServletResponse.SC_NOT_FOUND,
+                request.getRequestPathInfo() + " can not be found");
+
+        // Request handled (though not in a nice way)
+        return true;
+    }
+
+}
diff --git a/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java b/server/src/com/vaadin/server/HttpServletRequestListener.java
index 22467a0c1a..1f9f633c17 100644
--- a/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java
+++ b/server/src/com/vaadin/server/HttpServletRequestListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
@@ -24,7 +24,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.vaadin.Application;
 import com.vaadin.service.ApplicationContext.TransactionListener;
-import com.vaadin.terminal.Terminal;
 
 /**
  * {@link Application} that implements this interface gets notified of request
diff --git a/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java b/server/src/com/vaadin/server/JavaScriptCallbackHelper.java
index f0063a8708..19b19ce824 100644
--- a/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java
+++ b/server/src/com/vaadin/server/JavaScriptCallbackHelper.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -36,7 +36,7 @@ import com.vaadin.ui.JavaScriptFunction;
  * Internal helper class used to implement functionality common to
  * {@link AbstractJavaScriptComponent} and {@link AbstractJavaScriptExtension}.
  * Corresponding support in client-side code is in
- * {@link com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper}.
+ * {@link com.vaadin.client.JavaScriptConnectorHelper}.
  * <p>
  * You should most likely no use this class directly.
  * 
diff --git a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java b/server/src/com/vaadin/server/JsonCodec.java
index 3ba52a4e91..689ffe034e 100644
--- a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java
+++ b/server/src/com/vaadin/server/JsonCodec.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
diff --git a/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/server/src/com/vaadin/server/JsonPaintTarget.java
index cfc3cc7e7e..b193c47528 100644
--- a/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
+++ b/server/src/com/vaadin/server/JsonPaintTarget.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.PrintWriter;
 import java.io.Serializable;
@@ -27,11 +27,6 @@ import java.util.Stack;
 import java.util.Vector;
 import java.util.logging.Logger;
 
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.StreamVariable;
-import com.vaadin.terminal.VariableOwner;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CustomLayout;
@@ -349,7 +344,12 @@ public class JsonPaintTarget implements PaintTarget {
         if (value == null) {
             throw new NullPointerException();
         }
-        ResourceReference reference = ResourceReference.create(value);
+        ClientConnector ownerConnector = openPaintables.peek();
+        ownerConnector.getUI().getApplication().getGlobalResourceHandler(true)
+                .register(value, ownerConnector);
+
+        ResourceReference reference = ResourceReference.create(value,
+                ownerConnector, name);
         addAttribute(name, reference.getURL());
     }
 
@@ -589,8 +589,7 @@ public class JsonPaintTarget implements PaintTarget {
      * @throws PaintException
      *             if the paint operation failed.
      * 
-     * @see com.vaadin.terminal.PaintTarget#addXMLSection(String, String,
-     *      String)
+     * @see com.vaadin.server.PaintTarget#addXMLSection(String, String, String)
      */
 
     @Override
diff --git a/server/src/com/vaadin/terminal/KeyMapper.java b/server/src/com/vaadin/server/KeyMapper.java
index cf54af545f..86714cfc66 100644
--- a/server/src/com/vaadin/terminal/KeyMapper.java
+++ b/server/src/com/vaadin/server/KeyMapper.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/server/src/com/vaadin/terminal/Vaadin6Component.java b/server/src/com/vaadin/server/LegacyComponent.java
index eb169c90f9..b6e620f920 100644
--- a/server/src/com/vaadin/terminal/Vaadin6Component.java
+++ b/server/src/com/vaadin/server/LegacyComponent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.util.EventListener;
 
@@ -29,7 +29,7 @@ import com.vaadin.ui.Component;
  * @since 7.0.0
  * 
  */
-public interface Vaadin6Component extends VariableOwner, Component,
+public interface LegacyComponent extends VariableOwner, Component,
         EventListener {
 
     /**
@@ -55,11 +55,11 @@ public interface Vaadin6Component extends VariableOwner, Component,
     /**
      * (non-Javadoc) {@inheritDoc}
      * <p>
-     * For a Vaadin6Component, markAsDirty will also cause
+     * For a LegacyComponent, markAsDirty will also cause
      * {@link #paintContent(PaintTarget)} to be called before sending changes to
      * the client.
      * 
-     * @see com.vaadin.terminal.gwt.server.ClientConnector#markAsDirty()
+     * @see com.vaadin.server.ClientConnector#markAsDirty()
      */
     @Override
     public void markAsDirty();
diff --git a/server/src/com/vaadin/terminal/LegacyPaint.java b/server/src/com/vaadin/server/LegacyPaint.java
index 3db0f52079..c39e0e8247 100644
--- a/server/src/com/vaadin/terminal/LegacyPaint.java
+++ b/server/src/com/vaadin/server/LegacyPaint.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.PaintTarget.PaintStatus;
+import com.vaadin.server.PaintTarget.PaintStatus;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HasComponents;
 
@@ -61,8 +61,8 @@ public class LegacyPaint implements Serializable {
             target.addAttribute("cached", true);
         } else {
             // Paint the contents of the component
-            if (component instanceof Vaadin6Component) {
-                ((Vaadin6Component) component).paintContent(target);
+            if (component instanceof LegacyComponent) {
+                ((LegacyComponent) component).paintContent(target);
             }
 
         }
diff --git a/server/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java b/server/src/com/vaadin/server/NoInputStreamException.java
index 445d8c3cb1..acd148864a 100644
--- a/server/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java
+++ b/server/src/com/vaadin/server/NoInputStreamException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 @SuppressWarnings("serial")
 public class NoInputStreamException extends Exception {
diff --git a/server/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java b/server/src/com/vaadin/server/NoOutputStreamException.java
index fc9b3dee8a..8900079b4b 100644
--- a/server/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java
+++ b/server/src/com/vaadin/server/NoOutputStreamException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 @SuppressWarnings("serial")
 public class NoOutputStreamException extends Exception {
diff --git a/server/src/com/vaadin/terminal/Page.java b/server/src/com/vaadin/server/Page.java
index 66ef7da296..b8fdae6cfb 100644
--- a/server/src/com/vaadin/terminal/Page.java
+++ b/server/src/com/vaadin/server/Page.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -24,12 +24,10 @@ import java.util.LinkedList;
 import java.util.List;
 
 import com.vaadin.event.EventRouter;
+import com.vaadin.server.WrappedRequest.BrowserDetails;
 import com.vaadin.shared.ui.BorderStyle;
 import com.vaadin.shared.ui.ui.PageClientRpc;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.WrappedRequest.BrowserDetails;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
-import com.vaadin.terminal.gwt.server.WebBrowser;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.JavaScript;
 import com.vaadin.ui.Notification;
@@ -303,17 +301,36 @@ public class Page implements Serializable {
         }
     }
 
-    public void addListener(Page.FragmentChangedListener listener) {
+    public void addFragmentChangedListener(Page.FragmentChangedListener listener) {
         addListener(FragmentChangedEvent.class, listener,
                 FRAGMENT_CHANGED_METHOD);
     }
 
-    public void removeListener(Page.FragmentChangedListener listener) {
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFragmentChangedListener(FragmentChangedListener)}
+     **/
+    @Deprecated
+    public void addListener(Page.FragmentChangedListener listener) {
+        addFragmentChangedListener(listener);
+    }
+
+    public void removeFragmentChangedListener(
+            Page.FragmentChangedListener listener) {
         removeListener(FragmentChangedEvent.class, listener,
                 FRAGMENT_CHANGED_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFragmentChangedListener(FragmentChangedListener)}
+     **/
+    @Deprecated
+    public void removeListener(Page.FragmentChangedListener listener) {
+        removeFragmentChangedListener(listener);
+    }
+
+    /**
      * Sets URI fragment. Optionally fires a {@link FragmentChangedEvent}
      * 
      * @param newFragment
@@ -400,8 +417,8 @@ public class Page implements Serializable {
 
     /**
      * Adds a new {@link BrowserWindowResizeListener} to this uI. The listener
-     * will be notified whenever the browser window within which this uI
-     * resides is resized.
+     * will be notified whenever the browser window within which this uI resides
+     * is resized.
      * 
      * @param resizeListener
      *            the listener to add
@@ -409,25 +426,45 @@ public class Page implements Serializable {
      * @see BrowserWindowResizeListener#browserWindowResized(BrowserWindowResizeEvent)
      * @see #setResizeLazy(boolean)
      */
-    public void addListener(BrowserWindowResizeListener resizeListener) {
+    public void addBrowserWindowResizeListener(
+            BrowserWindowResizeListener resizeListener) {
         addListener(BrowserWindowResizeEvent.class, resizeListener,
                 BROWSWER_RESIZE_METHOD);
     }
 
     /**
-     * Removes a {@link BrowserWindowResizeListener} from this uI. The
-     * listener will no longer be notified when the browser window is resized.
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addBrowserWindowResizeListener(BrowserWindowResizeListener)}
+     **/
+    @Deprecated
+    public void addListener(BrowserWindowResizeListener resizeListener) {
+        addBrowserWindowResizeListener(resizeListener);
+    }
+
+    /**
+     * Removes a {@link BrowserWindowResizeListener} from this UI. The listener
+     * will no longer be notified when the browser window is resized.
      * 
      * @param resizeListener
      *            the listener to remove
      */
-    public void removeListener(BrowserWindowResizeListener resizeListener) {
+    public void removeBrowserWindowResizeListener(
+            BrowserWindowResizeListener resizeListener) {
         removeListener(BrowserWindowResizeEvent.class, resizeListener,
                 BROWSWER_RESIZE_METHOD);
     }
 
     /**
-     * Gets the last known height of the browser window in which this uI
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeBrowserWindowResizeListener(BrowserWindowResizeListener)}
+     **/
+    @Deprecated
+    public void removeListener(BrowserWindowResizeListener resizeListener) {
+        removeBrowserWindowResizeListener(resizeListener);
+    }
+
+    /**
+     * Gets the last known height of the browser window in which this UI
      * resides.
      * 
      * @return the browser window height in pixels
@@ -437,8 +474,7 @@ public class Page implements Serializable {
     }
 
     /**
-     * Gets the last known width of the browser window in which this uI
-     * resides.
+     * Gets the last known width of the browser window in which this uI resides.
      * 
      * @return the browser window width in pixels
      */
@@ -515,8 +551,8 @@ public class Page implements Serializable {
     }
 
     /**
-     * Opens the given resource in this uI. The contents of this UI is
-     * replaced by the {@code Resource}.
+     * Opens the given resource in this uI. The contents of this UI is replaced
+     * by the {@code Resource}.
      * 
      * @param resource
      *            the resource to show in this uI
diff --git a/server/src/com/vaadin/terminal/PaintException.java b/server/src/com/vaadin/server/PaintException.java
index dd5752653a..5d6f7b1d58 100644
--- a/server/src/com/vaadin/terminal/PaintException.java
+++ b/server/src/com/vaadin/server/PaintException.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/server/src/com/vaadin/terminal/PaintTarget.java b/server/src/com/vaadin/server/PaintTarget.java
index 5ccca8a8f0..268523f92f 100644
--- a/server/src/com/vaadin/terminal/PaintTarget.java
+++ b/server/src/com/vaadin/server/PaintTarget.java
@@ -14,13 +14,12 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.util.Map;
 
-import com.vaadin.terminal.StreamVariable.StreamingStartEvent;
-import com.vaadin.terminal.gwt.server.ClientConnector;
+import com.vaadin.server.StreamVariable.StreamingStartEvent;
 import com.vaadin.ui.Component;
 
 /**
@@ -194,7 +193,7 @@ public interface PaintTarget extends Serializable {
      * <p>
      * The urls in UIDL message may use Vaadin specific protocol. Before
      * actually using the urls on the client side, they should be passed via
-     * {@link com.vaadin.terminal.gwt.client.ApplicationConnection#translateVaadinUri(String)}.
+     * {@link com.vaadin.client.ApplicationConnection#translateVaadinUri(String)}.
      * <p>
      * Note that in current terminal implementation StreamVariables are cleaned
      * from the terminal only when:
diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/server/src/com/vaadin/server/PortletApplicationContext2.java
index 3e0f8d6b99..aca80f9c17 100644
--- a/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
+++ b/server/src/com/vaadin/server/PortletApplicationContext2.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.File;
 import java.io.Serializable;
@@ -45,7 +45,6 @@ import javax.servlet.http.HttpSessionBindingListener;
 import javax.xml.namespace.QName;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ExternalResource;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java b/server/src/com/vaadin/server/PortletCommunicationManager.java
index e127425786..f7d9371022 100644
--- a/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java
+++ b/server/src/com/vaadin/server/PortletCommunicationManager.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,10 +30,6 @@ import com.vaadin.Application;
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java b/server/src/com/vaadin/server/PortletRequestListener.java
index f7b6421e11..35f2a946c5 100644
--- a/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java
+++ b/server/src/com/vaadin/server/PortletRequestListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
@@ -23,7 +23,6 @@ import javax.servlet.Filter;
 
 import com.vaadin.Application;
 import com.vaadin.service.ApplicationContext.TransactionListener;
-import com.vaadin.terminal.Terminal;
 
 /**
  * An {@link Application} that implements this interface gets notified of
diff --git a/server/src/com/vaadin/terminal/RequestHandler.java b/server/src/com/vaadin/server/RequestHandler.java
index 2ea02487b1..fcc506cc54 100644
--- a/server/src/com/vaadin/terminal/RequestHandler.java
+++ b/server/src/com/vaadin/server/RequestHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/server/src/com/vaadin/terminal/gwt/server/RequestTimer.java b/server/src/com/vaadin/server/RequestTimer.java
index e3e0dc0106..1dfe24f23b 100644
--- a/server/src/com/vaadin/terminal/gwt/server/RequestTimer.java
+++ b/server/src/com/vaadin/server/RequestTimer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/Resource.java b/server/src/com/vaadin/server/Resource.java
index 27adb16869..fa1e040929 100644
--- a/server/src/com/vaadin/terminal/Resource.java
+++ b/server/src/com/vaadin/server/Resource.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/server/ResourceReference.java b/server/src/com/vaadin/server/ResourceReference.java
new file mode 100644
index 0000000000..098fb6c3e4
--- /dev/null
+++ b/server/src/com/vaadin/server/ResourceReference.java
@@ -0,0 +1,147 @@
+/* 
+ * 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.server;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import com.vaadin.shared.ApplicationConstants;
+import com.vaadin.shared.communication.URLReference;
+
+public class ResourceReference extends URLReference {
+
+    private final Resource resource;
+    private final ClientConnector connector;
+    private final String key;
+
+    public ResourceReference(Resource resource, ClientConnector connector,
+            String key) {
+        this.resource = resource;
+        this.connector = connector;
+        this.key = key;
+    }
+
+    public Resource getResource() {
+        return resource;
+    }
+
+    @Override
+    public String getURL() {
+        if (resource instanceof ExternalResource) {
+            return ((ExternalResource) resource).getURL();
+        } else if (resource instanceof DynamicConnectorResource) {
+            DynamicConnectorResource dcr = (DynamicConnectorResource) resource;
+
+            String filename = dcr.getPath();
+            StringBuilder builder = new StringBuilder(getConnectorResourceBase(
+                    filename, dcr.getConnector()));
+
+            Set<Entry<String, String>> entrySet = dcr.getParameters()
+                    .entrySet();
+            boolean first = true;
+            for (Entry<String, String> entry : entrySet) {
+                String key = entry.getKey();
+                String value = entry.getValue();
+                if (first) {
+                    builder.append('?');
+                    first = false;
+                } else {
+                    builder.append('&');
+                }
+                // TODO URL encode!!!
+                builder.append(key).append('=').append(value);
+            }
+            return builder.toString();
+        } else if (resource instanceof ConnectorResource) {
+            ConnectorResource connectorResource = (ConnectorResource) resource;
+
+            GlobalResourceHandler globalResourceHandler = connector.getUI()
+                    .getApplication().getGlobalResourceHandler(false);
+            if (globalResourceHandler != null) {
+                String uri = globalResourceHandler.getUri(connector,
+                        connectorResource);
+                if (uri != null && !uri.isEmpty()) {
+                    return uri;
+                }
+            }
+
+            // app://APP/connector/[uiid]/[cid]/[key]/[filename]
+            String prefix = key;
+            String filename = connectorResource.getFilename();
+            if (filename != null && !filename.isEmpty()) {
+                prefix += '/' + filename;
+            }
+            String uri = getConnectorResourceBase(prefix, connector);
+            return uri;
+        } else if (resource instanceof ThemeResource) {
+            final String uri = "theme://"
+                    + ((ThemeResource) resource).getResourceId();
+            return uri;
+        } else {
+            throw new RuntimeException(getClass().getSimpleName()
+                    + " does not support resources of type: "
+                    + resource.getClass().getName());
+        }
+
+    }
+
+    private static String getConnectorResourceBase(String filename,
+            ClientConnector connector) {
+        String uri = ApplicationConstants.APP_PROTOCOL_PREFIX
+                + ApplicationConstants.APP_REQUEST_PATH
+                + ConnectorResource.CONNECTOR_REQUEST_PATH
+                + connector.getUI().getUIId() + '/'
+                + connector.getConnectorId() + '/' + encodeFileName(filename);
+        return uri;
+    }
+
+    public static String encodeFileName(String filename) {
+        // #7738 At least Tomcat and JBoss refuses requests containing
+        // encoded slashes or backslashes in URLs. Application resource URLs
+        // should really be passed in another way than as part of the path
+        // in the future.
+        return urlEncode(filename).replace("%2F", "/").replace("%5C", "\\");
+    }
+
+    static String urlEncode(String filename) {
+        try {
+            return URLEncoder.encode(filename, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(
+                    "UTF-8 charset not available (\"this should never happen\")",
+                    e);
+        }
+    }
+
+    public static ResourceReference create(Resource resource,
+            ClientConnector connector, String key) {
+        if (resource == null) {
+            return null;
+        } else {
+            return new ResourceReference(resource, connector, key);
+        }
+    }
+
+    public static Resource getResource(URLReference reference) {
+        if (reference == null) {
+            return null;
+        }
+        assert reference instanceof ResourceReference;
+        return ((ResourceReference) reference).getResource();
+    }
+}
diff --git a/server/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java b/server/src/com/vaadin/server/RestrictedRenderResponse.java
index 1e23a48388..6923a042d6 100644
--- a/server/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java
+++ b/server/src/com/vaadin/server/RestrictedRenderResponse.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/server/src/com/vaadin/terminal/gwt/server/RpcManager.java b/server/src/com/vaadin/server/RpcManager.java
index 4d1e0fc152..bb1c116388 100644
--- a/server/src/com/vaadin/terminal/gwt/server/RpcManager.java
+++ b/server/src/com/vaadin/server/RpcManager.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java b/server/src/com/vaadin/server/RpcTarget.java
index 1a3cf28fcc..c491707995 100644
--- a/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java
+++ b/server/src/com/vaadin/server/RpcTarget.java
@@ -14,12 +14,10 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.VariableOwner;
-
 /**
  * Marker interface for server side classes that can receive RPC calls.
  * 
diff --git a/server/src/com/vaadin/terminal/Scrollable.java b/server/src/com/vaadin/server/Scrollable.java
index 641b20ab34..ca89d598c5 100644
--- a/server/src/com/vaadin/terminal/Scrollable.java
+++ b/server/src/com/vaadin/server/Scrollable.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java b/server/src/com/vaadin/server/ServerRpcManager.java
index 9db6c20f00..92e4d24240 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java
+++ b/server/src/com/vaadin/server/ServerRpcManager.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
diff --git a/server/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java b/server/src/com/vaadin/server/ServerRpcMethodInvocation.java
index 060fb686d4..761db687bb 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java
+++ b/server/src/com/vaadin/server/ServerRpcMethodInvocation.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.lang.reflect.Method;
 import java.util.Map;
diff --git a/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java b/server/src/com/vaadin/server/ServletPortletHelper.java
index 1d35785a57..cce98ab925 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java
+++ b/server/src/com/vaadin/server/ServletPortletHelper.java
@@ -1,11 +1,9 @@
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
 import com.vaadin.Application;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /*
diff --git a/server/src/com/vaadin/terminal/gwt/server/SessionExpiredException.java b/server/src/com/vaadin/server/SessionExpiredException.java
index 05e85c1f72..1e93fbf4ee 100644
--- a/server/src/com/vaadin/terminal/gwt/server/SessionExpiredException.java
+++ b/server/src/com/vaadin/server/SessionExpiredException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 @SuppressWarnings("serial")
 public class SessionExpiredException extends Exception {
diff --git a/server/src/com/vaadin/terminal/Sizeable.java b/server/src/com/vaadin/server/Sizeable.java
index d8d0b0e043..36562a059d 100644
--- a/server/src/com/vaadin/terminal/Sizeable.java
+++ b/server/src/com/vaadin/server/Sizeable.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/StreamResource.java b/server/src/com/vaadin/server/StreamResource.java
index bbb58c71e2..26514c9353 100644
--- a/server/src/com/vaadin/terminal/StreamResource.java
+++ b/server/src/com/vaadin/server/StreamResource.java
@@ -14,12 +14,11 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.InputStream;
 import java.io.Serializable;
 
-import com.vaadin.Application;
 import com.vaadin.service.FileTypeResolver;
 
 /**
@@ -32,7 +31,7 @@ import com.vaadin.service.FileTypeResolver;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class StreamResource implements ApplicationResource {
+public class StreamResource implements ConnectorResource {
 
     /**
      * Source stream the downloaded content is fetched from.
@@ -50,11 +49,6 @@ public class StreamResource implements ApplicationResource {
     private String filename;
 
     /**
-     * Application.
-     */
-    private final Application application;
-
-    /**
      * Default buffer size for this stream resource.
      */
     private int bufferSize = 0;
@@ -62,7 +56,7 @@ public class StreamResource implements ApplicationResource {
     /**
      * Default cache time for this stream resource.
      */
-    private long cacheTime = DEFAULT_CACHETIME;
+    private long cacheTime = DownloadStream.DEFAULT_CACHETIME;
 
     /**
      * Creates a new stream resource for downloading from stream.
@@ -74,20 +68,13 @@ public class StreamResource implements ApplicationResource {
      * @param application
      *            the Application object.
      */
-    public StreamResource(StreamSource streamSource, String filename,
-            Application application) {
-
-        this.application = application;
+    public StreamResource(StreamSource streamSource, String filename) {
         setFilename(filename);
         setStreamSource(streamSource);
-
-        // Register to application
-        application.addResource(this);
-
     }
 
     /**
-     * @see com.vaadin.terminal.Resource#getMIMEType()
+     * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
     public String getMIMEType() {
@@ -149,17 +136,6 @@ public class StreamResource implements ApplicationResource {
         this.filename = filename;
     }
 
-    /**
-     * @see com.vaadin.terminal.ApplicationResource#getApplication()
-     */
-    @Override
-    public Application getApplication() {
-        return application;
-    }
-
-    /**
-     * @see com.vaadin.terminal.ApplicationResource#getStream()
-     */
     @Override
     public DownloadStream getStream() {
         final StreamSource ss = getStreamSource();
@@ -187,8 +163,16 @@ public class StreamResource implements ApplicationResource {
         public InputStream getStream();
     }
 
-    /* documented in superclass */
-    @Override
+    /**
+     * Gets the size of the download buffer used for this resource.
+     * 
+     * <p>
+     * If the buffer size is 0, the buffer size is decided by the terminal
+     * adapter. The default value is 0.
+     * </p>
+     * 
+     * @return the size of the buffer in bytes.
+     */
     public int getBufferSize() {
         return bufferSize;
     }
@@ -203,8 +187,14 @@ public class StreamResource implements ApplicationResource {
         this.bufferSize = bufferSize;
     }
 
-    /* documented in superclass */
-    @Override
+    /**
+     * Gets the length of cache expiration time. This gives the adapter the
+     * possibility cache streams sent to the client. The caching may be made in
+     * adapter or at the client if the client supports caching. Default is
+     * <code>DownloadStream.DEFAULT_CACHETIME</code>.
+     * 
+     * @return Cache time in milliseconds.
+     */
     public long getCacheTime() {
         return cacheTime;
     }
@@ -227,4 +217,29 @@ public class StreamResource implements ApplicationResource {
         this.cacheTime = cacheTime;
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        } else if (obj instanceof StreamResource) {
+            StreamResource that = (StreamResource) obj;
+            return getStreamSource().equals(that.getStreamSource())
+                    && getMIMEType().equals(that.getMIMEType())
+                    && String.valueOf(getFilename()).equals(
+                            String.valueOf(that.getFilename()))
+                    && getBufferSize() == that.getBufferSize()
+                    && getCacheTime() == that.getCacheTime();
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return (int) (getStreamSource().hashCode() + 37
+                * getMIMEType().hashCode() + 37 ^ 2
+                * String.valueOf(getFilename()).hashCode() + 37 ^ 3
+                * getBufferSize() + 37 ^ 4 * getCacheTime());
+    }
+
 }
diff --git a/server/src/com/vaadin/terminal/StreamVariable.java b/server/src/com/vaadin/server/StreamVariable.java
index 53f398f09c..f289e7612a 100644
--- a/server/src/com/vaadin/terminal/StreamVariable.java
+++ b/server/src/com/vaadin/server/StreamVariable.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.OutputStream;
 import java.io.Serializable;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.StreamVariable.StreamingEndEvent;
-import com.vaadin.terminal.StreamVariable.StreamingErrorEvent;
-import com.vaadin.terminal.StreamVariable.StreamingStartEvent;
+import com.vaadin.server.StreamVariable.StreamingEndEvent;
+import com.vaadin.server.StreamVariable.StreamingErrorEvent;
+import com.vaadin.server.StreamVariable.StreamingStartEvent;
 
 /**
  * StreamVariable is a special kind of variable whose value is streamed to an
@@ -152,7 +152,7 @@ public interface StreamVariable extends Serializable {
      * the streaming ended before the end of the input. The streaming may fail
      * due an interruption by {@link } or due an other unknown exception in
      * communication. In the latter case the exception is also passed to
-     * {@link Application#terminalError(com.vaadin.terminal.Terminal.ErrorEvent)}
+     * {@link Application#terminalError(com.vaadin.server.Terminal.ErrorEvent)}
      * .
      */
     public interface StreamingErrorEvent extends StreamingEvent {
diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java b/server/src/com/vaadin/server/StreamingEndEventImpl.java
index 6bc9f8fbd9..0b97989230 100644
--- a/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java
+++ b/server/src/com/vaadin/server/StreamingEndEventImpl.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
-import com.vaadin.terminal.StreamVariable.StreamingEndEvent;
+import com.vaadin.server.StreamVariable.StreamingEndEvent;
 
 @SuppressWarnings("serial")
 final class StreamingEndEventImpl extends AbstractStreamingEvent implements
diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java b/server/src/com/vaadin/server/StreamingErrorEventImpl.java
index cf9339d676..b892f5d386 100644
--- a/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java
+++ b/server/src/com/vaadin/server/StreamingErrorEventImpl.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
-import com.vaadin.terminal.StreamVariable.StreamingErrorEvent;
+import com.vaadin.server.StreamVariable.StreamingErrorEvent;
 
 @SuppressWarnings("serial")
 final class StreamingErrorEventImpl extends AbstractStreamingEvent implements
diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java b/server/src/com/vaadin/server/StreamingProgressEventImpl.java
index bcb114db60..ae665a24e8 100644
--- a/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java
+++ b/server/src/com/vaadin/server/StreamingProgressEventImpl.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
-import com.vaadin.terminal.StreamVariable.StreamingProgressEvent;
+import com.vaadin.server.StreamVariable.StreamingProgressEvent;
 
 @SuppressWarnings("serial")
 final class StreamingProgressEventImpl extends AbstractStreamingEvent implements
diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java b/server/src/com/vaadin/server/StreamingStartEventImpl.java
index 07ff6cf7b1..5c9b215877 100644
--- a/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java
+++ b/server/src/com/vaadin/server/StreamingStartEventImpl.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
-import com.vaadin.terminal.StreamVariable.StreamingStartEvent;
+import com.vaadin.server.StreamVariable.StreamingStartEvent;
 
 @SuppressWarnings("serial")
 final class StreamingStartEventImpl extends AbstractStreamingEvent implements
diff --git a/server/src/com/vaadin/terminal/SystemError.java b/server/src/com/vaadin/server/SystemError.java
index c4cb7eef0c..5d1426e87c 100644
--- a/server/src/com/vaadin/terminal/SystemError.java
+++ b/server/src/com/vaadin/server/SystemError.java
@@ -14,9 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
-
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
+package com.vaadin.server;
 
 /**
  * <code>SystemError</code> is an error message for a problem caused by error in
diff --git a/server/src/com/vaadin/terminal/gwt/server/SystemMessageException.java b/server/src/com/vaadin/server/SystemMessageException.java
index 5575bcb618..9c37d61424 100644
--- a/server/src/com/vaadin/terminal/gwt/server/SystemMessageException.java
+++ b/server/src/com/vaadin/server/SystemMessageException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 @SuppressWarnings("serial")
 public class SystemMessageException extends RuntimeException {
diff --git a/server/src/com/vaadin/terminal/Terminal.java b/server/src/com/vaadin/server/Terminal.java
index a02bcb50bb..265668aa42 100644
--- a/server/src/com/vaadin/terminal/Terminal.java
+++ b/server/src/com/vaadin/server/Terminal.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/ThemeResource.java b/server/src/com/vaadin/server/ThemeResource.java
index 61fe157ee6..7ae0bab828 100644
--- a/server/src/com/vaadin/terminal/ThemeResource.java
+++ b/server/src/com/vaadin/server/ThemeResource.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import com.vaadin.service.FileTypeResolver;
 
@@ -97,7 +97,7 @@ public class ThemeResource implements Resource {
     }
 
     /**
-     * @see com.vaadin.terminal.Resource#getMIMEType()
+     * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
     public String getMIMEType() {
diff --git a/server/src/com/vaadin/terminal/UIProvider.java b/server/src/com/vaadin/server/UIProvider.java
index 27b63fbcac..f262a3e225 100644
--- a/server/src/com/vaadin/terminal/UIProvider.java
+++ b/server/src/com/vaadin/server/UIProvider.java
@@ -14,7 +14,7 @@
  * the License.

  */

 

-package com.vaadin.terminal;

+package com.vaadin.server;

 

 import com.vaadin.Application;

 import com.vaadin.UIRequiresMoreInformationException;

@@ -24,6 +24,6 @@ public interface UIProvider {
     public Class<? extends UI> getUIClass(Application application,

             WrappedRequest request) throws UIRequiresMoreInformationException;

 

-    public UI instantiateUI(Application application,

-            Class<? extends UI> type, WrappedRequest request);

+    public UI instantiateUI(Application application, Class<? extends UI> type,

+            WrappedRequest request);

 }

diff --git a/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java b/server/src/com/vaadin/server/UnsupportedBrowserHandler.java
index 22e46cb722..325edb5d61 100644
--- a/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java
+++ b/server/src/com/vaadin/server/UnsupportedBrowserHandler.java
@@ -13,15 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.Writer;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
 
 /**
  * A {@link RequestHandler} that presents an informative page if the browser in
diff --git a/server/src/com/vaadin/terminal/gwt/server/UploadException.java b/server/src/com/vaadin/server/UploadException.java
index 566c98bf2b..cc3b075a8b 100644
--- a/server/src/com/vaadin/terminal/gwt/server/UploadException.java
+++ b/server/src/com/vaadin/server/UploadException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 @SuppressWarnings("serial")
 public class UploadException extends Exception {
diff --git a/server/src/com/vaadin/terminal/UserError.java b/server/src/com/vaadin/server/UserError.java
index 18680f912f..756f2e70e0 100644
--- a/server/src/com/vaadin/terminal/UserError.java
+++ b/server/src/com/vaadin/server/UserError.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 /**
  * <code>UserError</code> is a controlled error occurred in application. User
diff --git a/server/src/com/vaadin/terminal/VariableOwner.java b/server/src/com/vaadin/server/VariableOwner.java
index faa0298311..c917996e6b 100644
--- a/server/src/com/vaadin/terminal/VariableOwner.java
+++ b/server/src/com/vaadin/server/VariableOwner.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -31,7 +31,7 @@ import java.util.Map;
  * @author Vaadin Ltd.
  * @since 3.0
  * @deprecated in 7.0. Only provided to ease porting of Vaadin 6 components. Do
- *             not implement this directly, implement {@link Vaadin6Component}.
+ *             not implement this directly, implement {@link LegacyComponent}.
  */
 @Deprecated
 public interface VariableOwner extends Serializable {
diff --git a/server/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java b/server/src/com/vaadin/server/WebApplicationContext.java
index bfcc0c1038..7059a04682 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java
+++ b/server/src/com/vaadin/server/WebApplicationContext.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.File;
 import java.util.Enumeration;
diff --git a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/server/src/com/vaadin/server/WebBrowser.java
index 37bc81cfcf..92090da14a 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java
+++ b/server/src/com/vaadin/server/WebBrowser.java
@@ -14,13 +14,12 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.Date;
 import java.util.Locale;
 
 import com.vaadin.shared.VBrowserDetails;
-import com.vaadin.terminal.WrappedRequest;
 
 /**
  * Class that provides information about the web browser the user is using.
diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java b/server/src/com/vaadin/server/WrappedHttpServletRequest.java
index a64be4c163..cb8a9e8c5f 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
+++ b/server/src/com/vaadin/server/WrappedHttpServletRequest.java
@@ -14,15 +14,12 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.CombinedRequest;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedRequest;
 
 /**
  * Wrapper for {@link HttpServletRequest}.
diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java b/server/src/com/vaadin/server/WrappedHttpServletResponse.java
index 237bb643ee..f2916ac0eb 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java
+++ b/server/src/com/vaadin/server/WrappedHttpServletResponse.java
@@ -14,14 +14,11 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedResponse;
-
 /**
  * Wrapper for {@link HttpServletResponse}.
  * 
diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java b/server/src/com/vaadin/server/WrappedPortletRequest.java
index 9ac2e5a608..40a5c5f509 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java
+++ b/server/src/com/vaadin/server/WrappedPortletRequest.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,9 +27,6 @@ import javax.portlet.ResourceRequest;
 
 import com.vaadin.Application;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.CombinedRequest;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedRequest;
 
 /**
  * Wrapper for {@link PortletRequest} and its subclasses.
diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java b/server/src/com/vaadin/server/WrappedPortletResponse.java
index 39ccacd331..f84e3619d2 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java
+++ b/server/src/com/vaadin/server/WrappedPortletResponse.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -29,9 +29,6 @@ import javax.portlet.MimeResponse;
 import javax.portlet.PortletResponse;
 import javax.portlet.ResourceResponse;
 
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedResponse;
-
 /**
  * Wrapper for {@link PortletResponse} and its subclasses.
  * 
diff --git a/server/src/com/vaadin/terminal/WrappedRequest.java b/server/src/com/vaadin/server/WrappedRequest.java
index 343a60848e..8ae5335763 100644
--- a/server/src/com/vaadin/terminal/WrappedRequest.java
+++ b/server/src/com/vaadin/server/WrappedRequest.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest;
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
 import com.vaadin.annotations.EagerInit;
-import com.vaadin.terminal.gwt.server.WebBrowser;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/server/src/com/vaadin/terminal/WrappedResponse.java b/server/src/com/vaadin/server/WrappedResponse.java
index 02daaa1bdd..c8d9342418 100644
--- a/server/src/com/vaadin/terminal/WrappedResponse.java
+++ b/server/src/com/vaadin/server/WrappedResponse.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/server/src/com/vaadin/terminal/package.html b/server/src/com/vaadin/server/package.html
index 83514a0de5..83514a0de5 100644
--- a/server/src/com/vaadin/terminal/package.html
+++ b/server/src/com/vaadin/server/package.html
diff --git a/server/src/com/vaadin/service/ApplicationContext.java b/server/src/com/vaadin/service/ApplicationContext.java
index 55495dcd5c..591704764f 100644
--- a/server/src/com/vaadin/service/ApplicationContext.java
+++ b/server/src/com/vaadin/service/ApplicationContext.java
@@ -18,12 +18,9 @@ package com.vaadin.service;
 
 import java.io.File;
 import java.io.Serializable;
-import java.net.URL;
 import java.util.Collection;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ApplicationResource;
-import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
 
 /**
  * <code>ApplicationContext</code> provides information about the running
@@ -86,59 +83,6 @@ public interface ApplicationContext extends Serializable {
     public int getMaxInactiveInterval();
 
     /**
-     * Generate a URL that can be used as the relative location of e.g. an
-     * {@link ApplicationResource}.
-     * 
-     * This method should only be called from the processing of a UIDL request,
-     * not from a background thread. The return value is null if used outside a
-     * suitable request.
-     * 
-     * @deprecated this method is intended for terminal implementation only and
-     *             is subject to change/removal from the interface (to
-     *             {@link AbstractCommunicationManager})
-     * 
-     * @param resource
-     * @param urlKey
-     *            a key for the resource that can later be extracted from a URL
-     *            with {@link #getURLKey(URL, String)}
-     */
-    @Deprecated
-    public String generateApplicationResourceURL(ApplicationResource resource,
-            String urlKey);
-
-    /**
-     * Tests if a URL is for an application resource (APP/...).
-     * 
-     * @deprecated this method is intended for terminal implementation only and
-     *             is subject to change/removal from the interface (to
-     *             {@link AbstractCommunicationManager})
-     * 
-     * @param context
-     * @param relativeUri
-     * @return
-     */
-    @Deprecated
-    public boolean isApplicationResourceURL(URL context, String relativeUri);
-
-    /**
-     * Gets the identifier (key) from an application resource URL. This key is
-     * the one that was given to
-     * {@link #generateApplicationResourceURL(ApplicationResource, String)} when
-     * creating the URL.
-     * 
-     * @deprecated this method is intended for terminal implementation only and
-     *             is subject to change/removal from the interface (to
-     *             {@link AbstractCommunicationManager})
-     * 
-     * 
-     * @param context
-     * @param relativeUri
-     * @return
-     */
-    @Deprecated
-    public String getURLKey(URL context, String relativeUri);
-
-    /**
      * Interface for listening to transaction events. Implement this interface
      * to listen to all transactions between the client and the application.
      * 
diff --git a/server/src/com/vaadin/service/FileTypeResolver.java b/server/src/com/vaadin/service/FileTypeResolver.java
index 2b289d6752..4b1c8697eb 100644
--- a/server/src/com/vaadin/service/FileTypeResolver.java
+++ b/server/src/com/vaadin/service/FileTypeResolver.java
@@ -23,8 +23,8 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 
 /**
  * Utility class that can figure out mime-types and icons related to files.
diff --git a/server/src/com/vaadin/terminal/ApplicationResource.java b/server/src/com/vaadin/terminal/ApplicationResource.java
deleted file mode 100644
index 1d1444b774..0000000000
--- a/server/src/com/vaadin/terminal/ApplicationResource.java
+++ /dev/null
@@ -1,85 +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;
-
-import java.io.Serializable;
-
-import com.vaadin.Application;
-
-/**
- * This interface must be implemented by classes wishing to provide Application
- * resources.
- * <p>
- * <code>ApplicationResource</code> are a set of named resources (pictures,
- * sounds, etc) associated with some specific application. Having named
- * application resources provides a convenient method for having inter-theme
- * common resources for an application.
- * </p>
- * 
- * @author Vaadin Ltd.
- * @since 3.0
- */
-public interface ApplicationResource extends Resource, Serializable {
-
-    /**
-     * Default cache time.
-     */
-    public static final long DEFAULT_CACHETIME = 1000 * 60 * 60 * 24;
-
-    /**
-     * Gets resource as stream.
-     */
-    public DownloadStream getStream();
-
-    /**
-     * Gets the application of the resource.
-     */
-    public Application getApplication();
-
-    /**
-     * Gets the virtual filename for this resource.
-     * 
-     * @return the file name associated to this resource.
-     */
-    public String getFilename();
-
-    /**
-     * Gets the length of cache expiration time.
-     * 
-     * <p>
-     * This gives the adapter the possibility cache streams sent to the client.
-     * The caching may be made in adapter or at the client if the client
-     * supports caching. Default is <code>DEFAULT_CACHETIME</code>.
-     * </p>
-     * 
-     * @return Cache time in milliseconds
-     */
-    public long getCacheTime();
-
-    /**
-     * Gets the size of the download buffer used for this resource.
-     * 
-     * <p>
-     * If the buffer size is 0, the buffer size is decided by the terminal
-     * adapter. The default value is 0.
-     * </p>
-     * 
-     * @return int the size of the buffer in bytes.
-     */
-    public int getBufferSize();
-
-}
diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java
deleted file mode 100644
index d5c0d604c3..0000000000
--- a/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java
+++ /dev/null
@@ -1,67 +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.server;
-
-import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletResponse;
-
-import com.vaadin.Application;
-import com.vaadin.terminal.ApplicationResource;
-import com.vaadin.terminal.DownloadStream;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
-
-public class ApplicationResourceHandler implements RequestHandler {
-    private static final Pattern APP_RESOURCE_PATTERN = Pattern
-            .compile("^/?APP/(\\d+)/.*");
-
-    @Override
-    public boolean handleRequest(Application application,
-            WrappedRequest request, WrappedResponse response)
-            throws IOException {
-        // Check for application resources
-        String requestPath = request.getRequestPathInfo();
-        if (requestPath == null) {
-            return false;
-        }
-        Matcher resourceMatcher = APP_RESOURCE_PATTERN.matcher(requestPath);
-
-        if (resourceMatcher.matches()) {
-            ApplicationResource resource = application
-                    .getResource(resourceMatcher.group(1));
-            if (resource != null) {
-                DownloadStream stream = resource.getStream();
-                if (stream != null) {
-                    stream.setCacheTime(resource.getCacheTime());
-                    stream.writeTo(response);
-                    return true;
-                }
-            }
-            // We get here if the url looks like an application resource but no
-            // resource can be served
-            response.sendError(HttpServletResponse.SC_NOT_FOUND,
-                    request.getRequestPathInfo() + " can not be found");
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java b/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java
deleted file mode 100644
index a1d5731f7d..0000000000
--- a/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java
+++ /dev/null
@@ -1,79 +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.server;
-
-import com.vaadin.Application;
-import com.vaadin.shared.communication.URLReference;
-import com.vaadin.terminal.ApplicationResource;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
-
-public class ResourceReference extends URLReference {
-
-    private Resource resource;
-
-    public ResourceReference(Resource resource) {
-        this.resource = resource;
-    }
-
-    public Resource getResource() {
-        return resource;
-    }
-
-    @Override
-    public String getURL() {
-        if (resource instanceof ExternalResource) {
-            return ((ExternalResource) resource).getURL();
-        } else if (resource instanceof ApplicationResource) {
-            final ApplicationResource r = (ApplicationResource) resource;
-            final Application a = r.getApplication();
-            if (a == null) {
-                throw new RuntimeException(
-                        "An ApplicationResource ("
-                                + r.getClass().getName()
-                                + " must be attached to an application when it is sent to the client.");
-            }
-            final String uri = a.getRelativeLocation(r);
-            return uri;
-        } else if (resource instanceof ThemeResource) {
-            final String uri = "theme://"
-                    + ((ThemeResource) resource).getResourceId();
-            return uri;
-        } else {
-            throw new RuntimeException(getClass().getSimpleName()
-                    + " does not support resources of type: "
-                    + resource.getClass().getName());
-        }
-
-    }
-
-    public static ResourceReference create(Resource resource) {
-        if (resource == null) {
-            return null;
-        } else {
-            return new ResourceReference(resource);
-        }
-    }
-
-    public static Resource getResource(URLReference reference) {
-        if (reference == null) {
-            return null;
-        }
-        assert reference instanceof ResourceReference;
-        return ((ResourceReference) reference).getResource();
-    }
-}
diff --git a/server/src/com/vaadin/ui/AbsoluteLayout.java b/server/src/com/vaadin/ui/AbsoluteLayout.java
index 56bbd19852..794de49671 100644
--- a/server/src/com/vaadin/ui/AbsoluteLayout.java
+++ b/server/src/com/vaadin/ui/AbsoluteLayout.java
@@ -24,12 +24,12 @@ import java.util.Map;
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.event.LayoutEvents.LayoutClickNotifier;
+import com.vaadin.server.Sizeable;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutServerRpc;
 import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutState;
-import com.vaadin.terminal.Sizeable;
 
 /**
  * AbsoluteLayout is a layout implementation that mimics html absolute
@@ -629,16 +629,33 @@ public class AbsoluteLayout extends AbstractLayout implements
     }
 
     @Override
-    public void addListener(LayoutClickListener listener) {
+    public void addLayoutClickListener(LayoutClickListener listener) {
         addListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER,
                 LayoutClickEvent.class, listener,
                 LayoutClickListener.clickMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addLayoutClickListener(LayoutClickListener)}
+     **/
+    @Deprecated
+    public void addListener(LayoutClickListener listener) {
+        addLayoutClickListener(listener);
+    }
+
     @Override
-    public void removeListener(LayoutClickListener listener) {
+    public void removeLayoutClickListener(LayoutClickListener listener) {
         removeListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER,
                 LayoutClickEvent.class, listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeLayoutClickListener(LayoutClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(LayoutClickListener listener) {
+        removeLayoutClickListener(listener);
+    }
 }
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 917b1a516d..045173036e 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -32,14 +32,14 @@ import com.vaadin.event.ActionManager;
 import com.vaadin.event.EventRouter;
 import com.vaadin.event.MethodEventSource;
 import com.vaadin.event.ShortcutListener;
+import com.vaadin.server.AbstractClientConnector;
+import com.vaadin.server.ClientConnector;
+import com.vaadin.server.ComponentSizeValidator;
+import com.vaadin.server.ErrorMessage;
+import com.vaadin.server.Resource;
+import com.vaadin.server.Terminal;
+import com.vaadin.shared.ComponentConstants;
 import com.vaadin.shared.ComponentState;
-import com.vaadin.terminal.AbstractClientConnector;
-import com.vaadin.terminal.ErrorMessage;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Terminal;
-import com.vaadin.terminal.gwt.server.ClientConnector;
-import com.vaadin.terminal.gwt.server.ComponentSizeValidator;
-import com.vaadin.terminal.gwt.server.ResourceReference;
 import com.vaadin.tools.ReflectTools;
 
 /**
@@ -297,7 +297,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      */
     @Override
     public Resource getIcon() {
-        return ResourceReference.getResource(getState().getIcon());
+        return getResource(ComponentConstants.ICON_RESOURCE);
     }
 
     /**
@@ -309,7 +309,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
      */
     @Override
     public void setIcon(Resource icon) {
-        getState().setIcon(ResourceReference.create(icon));
+        setResource(ComponentConstants.ICON_RESOURCE, icon);
     }
 
     /*
@@ -335,7 +335,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.Connector#isConnectorEnabled()
+     * @see com.vaadin.client.Connector#isConnectorEnabled()
      */
     @Override
     public boolean isConnectorEnabled() {
@@ -1072,7 +1072,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#getHeight()
+     * @see com.vaadin.Sizeable#getHeight()
      */
     @Override
     public float getHeight() {
@@ -1082,7 +1082,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#getHeightUnits()
+     * @see com.vaadin.server.Sizeable#getHeightUnits()
      */
     @Override
     public Unit getHeightUnits() {
@@ -1092,7 +1092,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#getWidth()
+     * @see com.vaadin.server.Sizeable#getWidth()
      */
     @Override
     public float getWidth() {
@@ -1102,7 +1102,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#getWidthUnits()
+     * @see com.vaadin.server.Sizeable#getWidthUnits()
      */
     @Override
     public Unit getWidthUnits() {
@@ -1112,7 +1112,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setHeight(float, Unit)
+     * @see com.vaadin.server.Sizeable#setHeight(float, Unit)
      */
     @Override
     public void setHeight(float height, Unit unit) {
@@ -1128,7 +1128,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setSizeFull()
+     * @see com.vaadin.server.Sizeable#setSizeFull()
      */
     @Override
     public void setSizeFull() {
@@ -1139,7 +1139,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setSizeUndefined()
+     * @see com.vaadin.server.Sizeable#setSizeUndefined()
      */
     @Override
     public void setSizeUndefined() {
@@ -1150,7 +1150,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setWidth(float, Unit)
+     * @see com.vaadin.server.Sizeable#setWidth(float, Unit)
      */
     @Override
     public void setWidth(float width, Unit unit) {
@@ -1166,7 +1166,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setWidth(java.lang.String)
+     * @see com.vaadin.server.Sizeable#setWidth(java.lang.String)
      */
     @Override
     public void setWidth(String width) {
@@ -1181,7 +1181,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setHeight(java.lang.String)
+     * @see com.vaadin.server.Sizeable#setHeight(java.lang.String)
      */
     @Override
     public void setHeight(String height) {
diff --git a/server/src/com/vaadin/ui/AbstractComponentContainer.java b/server/src/com/vaadin/ui/AbstractComponentContainer.java
index 4939eb1265..cf3bf1d2b9 100644
--- a/server/src/com/vaadin/ui/AbstractComponentContainer.java
+++ b/server/src/com/vaadin/ui/AbstractComponentContainer.java
@@ -22,7 +22,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.vaadin.terminal.gwt.server.ComponentSizeValidator;
+import com.vaadin.server.ComponentSizeValidator;
 
 /**
  * Extension to {@link AbstractComponent} that defines the default
@@ -106,33 +106,69 @@ public abstract class AbstractComponentContainer extends AbstractComponent
 
     /* documented in interface */
     @Override
-    public void addListener(ComponentAttachListener listener) {
+    public void addComponentAttachListener(ComponentAttachListener listener) {
         addListener(ComponentContainer.ComponentAttachEvent.class, listener,
                 COMPONENT_ATTACHED_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)}
+     **/
+    @Deprecated
+    public void addListener(ComponentAttachListener listener) {
+        addComponentAttachListener(listener);
+    }
+
     /* documented in interface */
     @Override
-    public void addListener(ComponentDetachListener listener) {
+    public void addComponentDetachListener(ComponentDetachListener listener) {
         addListener(ComponentContainer.ComponentDetachEvent.class, listener,
                 COMPONENT_DETACHED_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)}
+     **/
+    @Deprecated
+    public void addListener(ComponentDetachListener listener) {
+        addComponentDetachListener(listener);
+    }
+
     /* documented in interface */
     @Override
-    public void removeListener(ComponentAttachListener listener) {
+    public void removeComponentAttachListener(ComponentAttachListener listener) {
         removeListener(ComponentContainer.ComponentAttachEvent.class, listener,
                 COMPONENT_ATTACHED_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)}
+     **/
+    @Deprecated
+    public void removeListener(ComponentAttachListener listener) {
+        removeComponentAttachListener(listener);
+    }
+
     /* documented in interface */
     @Override
-    public void removeListener(ComponentDetachListener listener) {
+    public void removeComponentDetachListener(ComponentDetachListener listener) {
         removeListener(ComponentContainer.ComponentDetachEvent.class, listener,
                 COMPONENT_DETACHED_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)}
+     **/
+    @Deprecated
+    public void removeListener(ComponentDetachListener listener) {
+        removeComponentDetachListener(listener);
+    }
+
+    /**
      * Fires the component attached event. This should be called by the
      * addComponent methods after the component have been added to this
      * container.
diff --git a/server/src/com/vaadin/ui/AbstractEmbedded.java b/server/src/com/vaadin/ui/AbstractEmbedded.java
index 9396af5c44..d94f62120f 100644
--- a/server/src/com/vaadin/ui/AbstractEmbedded.java
+++ b/server/src/com/vaadin/ui/AbstractEmbedded.java
@@ -4,9 +4,8 @@
 
 package com.vaadin.ui;
 
+import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.gwt.server.ResourceReference;
 
 /**
  * Abstract base for embedding components.
@@ -32,12 +31,7 @@ public abstract class AbstractEmbedded extends AbstractComponent {
      *            the source to set.
      */
     public void setSource(Resource source) {
-        if (source == null) {
-            getState().setSource(null);
-        } else {
-            getState().setSource(new ResourceReference(source));
-        }
-        requestRepaint();
+        setResource(AbstractEmbeddedState.SOURCE_RESOURCE, source);
     }
 
     /**
@@ -46,12 +40,7 @@ public abstract class AbstractEmbedded extends AbstractComponent {
      * @return the source
      */
     public Resource getSource() {
-        ResourceReference ref = ((ResourceReference) getState().getSource());
-        if (ref == null) {
-            return null;
-        } else {
-            return ref.getResource();
-        }
+        return getResource(AbstractEmbeddedState.SOURCE_RESOURCE);
     }
 
     /**
diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java
index 5123d08da9..b1d45ae590 100644
--- a/server/src/com/vaadin/ui/AbstractField.java
+++ b/server/src/com/vaadin/ui/AbstractField.java
@@ -37,10 +37,10 @@ import com.vaadin.data.util.converter.ConverterUtil;
 import com.vaadin.event.Action;
 import com.vaadin.event.ShortcutAction;
 import com.vaadin.event.ShortcutListener;
+import com.vaadin.server.AbstractErrorMessage;
+import com.vaadin.server.CompositeErrorMessage;
+import com.vaadin.server.ErrorMessage;
 import com.vaadin.shared.AbstractFieldState;
-import com.vaadin.terminal.AbstractErrorMessage;
-import com.vaadin.terminal.CompositeErrorMessage;
-import com.vaadin.terminal.ErrorMessage;
 
 /**
  * <p>
@@ -1047,23 +1047,41 @@ public abstract class AbstractField<T> extends AbstractComponent implements
      * here, we use the default documentation from the implemented interface.
      */
     @Override
-    public void addListener(Property.ValueChangeListener listener) {
+    public void addValueChangeListener(Property.ValueChangeListener listener) {
         addListener(AbstractField.ValueChangeEvent.class, listener,
                 VALUE_CHANGE_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Property.ValueChangeListener listener) {
+        addValueChangeListener(listener);
+    }
+
     /*
      * Removes a value change listener from the field. Don't add a JavaDoc
      * comment here, we use the default documentation from the implemented
      * interface.
      */
     @Override
-    public void removeListener(Property.ValueChangeListener listener) {
+    public void removeValueChangeListener(Property.ValueChangeListener listener) {
         removeListener(AbstractField.ValueChangeEvent.class, listener,
                 VALUE_CHANGE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Property.ValueChangeListener listener) {
+        removeValueChangeListener(listener);
+    }
+
+    /**
      * Emits the value change event. The value contained in the field is
      * validated before the event is created.
      */
@@ -1139,23 +1157,43 @@ public abstract class AbstractField<T> extends AbstractComponent implements
      * implemented interface.
      */
     @Override
-    public void addListener(Property.ReadOnlyStatusChangeListener listener) {
+    public void addReadOnlyStatusChangeListener(
+            Property.ReadOnlyStatusChangeListener listener) {
         addListener(Property.ReadOnlyStatusChangeEvent.class, listener,
                 READ_ONLY_STATUS_CHANGE_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Property.ReadOnlyStatusChangeListener listener) {
+        addReadOnlyStatusChangeListener(listener);
+    }
+
     /*
      * Removes a read-only status change listener from the field. Don't add a
      * JavaDoc comment here, we use the default documentation from the
      * implemented interface.
      */
     @Override
-    public void removeListener(Property.ReadOnlyStatusChangeListener listener) {
+    public void removeReadOnlyStatusChangeListener(
+            Property.ReadOnlyStatusChangeListener listener) {
         removeListener(Property.ReadOnlyStatusChangeEvent.class, listener,
                 READ_ONLY_STATUS_CHANGE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Property.ReadOnlyStatusChangeListener listener) {
+        removeReadOnlyStatusChangeListener(listener);
+    }
+
+    /**
      * Emits the read-only status change event. The value contained in the field
      * is validated before the event is created.
      */
diff --git a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
index e19bdf1b2b..47420334d7 100644
--- a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
+++ b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
@@ -15,8 +15,8 @@
  */
 package com.vaadin.ui;
 
+import com.vaadin.server.JavaScriptCallbackHelper;
 import com.vaadin.shared.ui.JavaScriptComponentState;
-import com.vaadin.terminal.JavaScriptCallbackHelper;
 
 /**
  * Base class for Components with all client-side logic implemented using
@@ -35,9 +35,9 @@ import com.vaadin.terminal.JavaScriptCallbackHelper;
  * <code>com_example_MyComponent</code> has not been defined.
  * <p>
  * JavaScript components have a very simple GWT widget (
- * {@link com.vaadin.terminal.gwt.client.ui.JavaScriptWidget} ) just consisting
- * of a <code>div</code> element to which the JavaScript code should initialize
- * its own user interface.
+ * {@link com.vaadin.client.ui.JavaScriptWidget} ) just consisting of a
+ * <code>div</code> element to which the JavaScript code should initialize its
+ * own user interface.
  * <p>
  * The initialization function will be called with <code>this</code> pointing to
  * a connector wrapper object providing integration to Vaadin with the following
@@ -80,8 +80,7 @@ import com.vaadin.terminal.JavaScriptCallbackHelper;
  * functions is described bellow.</li>
  * <li><code>translateVaadinUri(uri)</code> - Translates a Vaadin URI to a URL
  * that can be used in the browser. This is just way of accessing
- * {@link com.vaadin.terminal.gwt.client.ApplicationConnection#translateVaadinUri(String)}
- * </li>
+ * {@link com.vaadin.client.ApplicationConnection#translateVaadinUri(String)}</li>
  * </ul>
  * The connector wrapper also supports these special functions:
  * <ul>
diff --git a/server/src/com/vaadin/ui/AbstractMedia.java b/server/src/com/vaadin/ui/AbstractMedia.java
index 77c12ac045..3f59b070b7 100644
--- a/server/src/com/vaadin/ui/AbstractMedia.java
+++ b/server/src/com/vaadin/ui/AbstractMedia.java
@@ -16,14 +16,21 @@
 
 package com.vaadin.ui;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.vaadin.server.ConnectorResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ResourceReference;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.shared.communication.URLReference;
 import com.vaadin.shared.ui.AbstractMediaState;
 import com.vaadin.shared.ui.MediaControl;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.gwt.server.ResourceReference;
 
 /**
  * Abstract base class for the HTML5 media components.
@@ -64,11 +71,43 @@ public abstract class AbstractMedia extends AbstractComponent {
      */
     public void addSource(Resource source) {
         if (source != null) {
-            getState().getSources().add(new ResourceReference(source));
+            List<URLReference> sources = getState().getSources();
+            sources.add(new ResourceReference(source, this, Integer
+                    .toString(sources.size())));
             getState().getSourceTypes().add(source.getMIMEType());
         }
     }
 
+    @Override
+    public boolean handleConnectorRequest(WrappedRequest request,
+            WrappedResponse response, String path) throws IOException {
+        Matcher matcher = Pattern.compile("(\\d+)(/.*)?").matcher(path);
+        if (matcher.matches()) {
+            List<URLReference> sources = getState().getSources();
+
+            int sourceIndex = Integer.parseInt(matcher.group(1));
+
+            if (sourceIndex < 0 || sourceIndex >= sources.size()) {
+                getLogger().warning(
+                        "Requested source index " + sourceIndex
+                                + " is out of bounds");
+                return false;
+            }
+
+            URLReference reference = sources.get(sourceIndex);
+            ConnectorResource resource = (ConnectorResource) ResourceReference
+                    .getResource(reference);
+            resource.getStream().writeResponse(request, response);
+            return true;
+        } else {
+            return super.handleConnectorRequest(request, response, path);
+        }
+    }
+
+    private Logger getLogger() {
+        return Logger.getLogger(AbstractMedia.class.getName());
+    }
+
     /**
      * Set multiple sources at once. Which of the sources is used is selected by
      * the browser depending on which file formats it supports. See <a
diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
index 596bbb7ee2..184f7c40f4 100644
--- a/server/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -22,6 +22,7 @@ import java.util.LinkedList;
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.event.LayoutEvents.LayoutClickNotifier;
+import com.vaadin.server.Sizeable;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
@@ -29,7 +30,6 @@ import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutServerRpc;
 import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState;
 import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState.ChildComponentData;
-import com.vaadin.terminal.Sizeable;
 
 @SuppressWarnings("serial")
 public abstract class AbstractOrderedLayout extends AbstractLayout implements
@@ -339,19 +339,37 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     }
 
     @Override
-    public void addListener(LayoutClickListener listener) {
+    public void addLayoutClickListener(LayoutClickListener listener) {
         addListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER,
                 LayoutClickEvent.class, listener,
                 LayoutClickListener.clickMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addLayoutClickListener(LayoutClickListener)}
+     **/
+    @Deprecated
+    public void addListener(LayoutClickListener listener) {
+        addLayoutClickListener(listener);
+    }
+
     @Override
-    public void removeListener(LayoutClickListener listener) {
+    public void removeLayoutClickListener(LayoutClickListener listener) {
         removeListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER,
                 LayoutClickEvent.class, listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeLayoutClickListener(LayoutClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(LayoutClickListener listener) {
+        removeLayoutClickListener(listener);
+    }
+
+    /**
      * Returns the index of the given component.
      * 
      * @param component
diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java
index 21ff7ba948..3dba5088df 100644
--- a/server/src/com/vaadin/ui/AbstractSelect.java
+++ b/server/src/com/vaadin/ui/AbstractSelect.java
@@ -39,12 +39,12 @@ import com.vaadin.event.dd.TargetDetailsImpl;
 import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion;
 import com.vaadin.event.dd.acceptcriteria.ContainsDataFlavor;
 import com.vaadin.event.dd.acceptcriteria.TargetDetailIs;
+import com.vaadin.server.KeyMapper;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
-import com.vaadin.terminal.KeyMapper;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
 
 /**
@@ -68,7 +68,7 @@ import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
 public abstract class AbstractSelect extends AbstractField<Object> implements
         Container, Container.Viewer, Container.PropertySetChangeListener,
         Container.PropertySetChangeNotifier, Container.ItemSetChangeNotifier,
-        Container.ItemSetChangeListener, Vaadin6Component {
+        Container.ItemSetChangeListener, LegacyComponent {
 
     public enum ItemCaptionMode {
         /**
@@ -1480,7 +1480,8 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
      * @see com.vaadin.data.Container.PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener)
      */
     @Override
-    public void addListener(Container.PropertySetChangeListener listener) {
+    public void addPropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (propertySetEventListeners == null) {
             propertySetEventListeners = new LinkedHashSet<Container.PropertySetChangeListener>();
         }
@@ -1488,12 +1489,22 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Container.PropertySetChangeListener listener) {
+        addPropertySetChangeListener(listener);
+    }
+
+    /**
      * Removes a previously registered Property set change listener.
      * 
      * @see com.vaadin.data.Container.PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.PropertySetChangeListener)
      */
     @Override
-    public void removeListener(Container.PropertySetChangeListener listener) {
+    public void removePropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (propertySetEventListeners != null) {
             propertySetEventListeners.remove(listener);
             if (propertySetEventListeners.isEmpty()) {
@@ -1503,12 +1514,22 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Container.PropertySetChangeListener listener) {
+        removePropertySetChangeListener(listener);
+    }
+
+    /**
      * Adds an Item set change listener for the object.
      * 
      * @see com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
     @Override
-    public void addListener(Container.ItemSetChangeListener listener) {
+    public void addItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (itemSetEventListeners == null) {
             itemSetEventListeners = new LinkedHashSet<Container.ItemSetChangeListener>();
         }
@@ -1516,12 +1537,22 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Container.ItemSetChangeListener listener) {
+        addItemSetChangeListener(listener);
+    }
+
+    /**
      * Removes the Item set change listener from the object.
      * 
      * @see com.vaadin.data.Container.ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
     @Override
-    public void removeListener(Container.ItemSetChangeListener listener) {
+    public void removeItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (itemSetEventListeners != null) {
             itemSetEventListeners.remove(listener);
             if (itemSetEventListeners.isEmpty()) {
@@ -1530,6 +1561,15 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Container.ItemSetChangeListener listener) {
+        removeItemSetChangeListener(listener);
+    }
+
     @Override
     public Collection<?> getListeners(Class<?> eventType) {
         if (Container.ItemSetChangeEvent.class.isAssignableFrom(eventType)) {
diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java
index 8b7499115c..f1452caacf 100644
--- a/server/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java
@@ -22,12 +22,12 @@ import java.util.Iterator;
 
 import com.vaadin.event.ComponentEventListener;
 import com.vaadin.event.MouseEvents.ClickEvent;
+import com.vaadin.server.Sizeable;
 import com.vaadin.shared.EventId;
 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.Sizeable;
 import com.vaadin.tools.ReflectTools;
 
 /**
@@ -501,16 +501,34 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
 
     }
 
-    public void addListener(SplitterClickListener listener) {
+    public void addSplitterClickListener(SplitterClickListener listener) {
         addListener(EventId.CLICK_EVENT_IDENTIFIER, SplitterClickEvent.class,
                 listener, SplitterClickListener.clickMethod);
     }
 
-    public void removeListener(SplitterClickListener listener) {
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addSplitterClickListener(SplitterClickListener)}
+     **/
+    @Deprecated
+    public void addListener(SplitterClickListener listener) {
+        addSplitterClickListener(listener);
+    }
+
+    public void removeSplitterClickListener(SplitterClickListener listener) {
         removeListener(EventId.CLICK_EVENT_IDENTIFIER,
                 SplitterClickEvent.class, listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeSplitterClickListener(SplitterClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(SplitterClickListener listener) {
+        removeSplitterClickListener(listener);
+    }
+
     @Override
     protected AbstractSplitPanelState getState() {
         return (AbstractSplitPanelState) super.getState();
diff --git a/server/src/com/vaadin/ui/AbstractTextField.java b/server/src/com/vaadin/ui/AbstractTextField.java
index 1bd61023a4..c187d9e198 100644
--- a/server/src/com/vaadin/ui/AbstractTextField.java
+++ b/server/src/com/vaadin/ui/AbstractTextField.java
@@ -27,14 +27,14 @@ import com.vaadin.event.FieldEvents.FocusNotifier;
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
 import com.vaadin.event.FieldEvents.TextChangeNotifier;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.ui.textfield.AbstractTextFieldState;
 import com.vaadin.shared.ui.textfield.TextFieldConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
 
 public abstract class AbstractTextField extends AbstractField<String> implements
-        BlurNotifier, FocusNotifier, TextChangeNotifier, Vaadin6Component {
+        BlurNotifier, FocusNotifier, TextChangeNotifier, LegacyComponent {
 
     /**
      * Null representation.
@@ -512,18 +512,36 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     }
 
     @Override
-    public void addListener(TextChangeListener listener) {
+    public void addTextChangeListener(TextChangeListener listener) {
         addListener(TextChangeListener.EVENT_ID, TextChangeEvent.class,
                 listener, TextChangeListener.EVENT_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addTextChangeListener(TextChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(TextChangeListener listener) {
+        addTextChangeListener(listener);
+    }
+
     @Override
-    public void removeListener(TextChangeListener listener) {
+    public void removeTextChangeListener(TextChangeListener listener) {
         removeListener(TextChangeListener.EVENT_ID, TextChangeEvent.class,
                 listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeTextChangeListener(TextChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(TextChangeListener listener) {
+        removeTextChangeListener(listener);
+    }
+
+    /**
      * The text change timeout modifies how often text change events are
      * communicated to the application when {@link #getTextChangeEventMode()} is
      * {@link TextChangeEventMode#LAZY} or {@link TextChangeEventMode#TIMEOUT}.
@@ -661,25 +679,60 @@ public abstract class AbstractTextField extends AbstractField<String> implements
     }
 
     @Override
-    public void addListener(FocusListener listener) {
+    public void addFocusListener(FocusListener listener) {
         addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void addListener(FocusListener listener) {
+        addFocusListener(listener);
+    }
+
     @Override
-    public void removeListener(FocusListener listener) {
+    public void removeFocusListener(FocusListener listener) {
         removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void removeListener(FocusListener listener) {
+        removeFocusListener(listener);
+    }
+
     @Override
-    public void addListener(BlurListener listener) {
+    public void addBlurListener(BlurListener listener) {
         addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void addListener(BlurListener listener) {
+        addBlurListener(listener);
+    }
+
     @Override
-    public void removeListener(BlurListener listener) {
+    public void removeBlurListener(BlurListener listener) {
         removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void removeListener(BlurListener listener) {
+        removeBlurListener(listener);
+    }
+
 }
diff --git a/server/src/com/vaadin/ui/Audio.java b/server/src/com/vaadin/ui/Audio.java
index 03ed7ba6d5..d111c0c74c 100644
--- a/server/src/com/vaadin/ui/Audio.java
+++ b/server/src/com/vaadin/ui/Audio.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.ui;
 
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.Resource;
 
 /**
  * The Audio component translates into an HTML5 &lt;audio&gt; element and as
diff --git a/server/src/com/vaadin/ui/Button.java b/server/src/com/vaadin/ui/Button.java
index 68b9f1392f..2e026ebc52 100644
--- a/server/src/com/vaadin/ui/Button.java
+++ b/server/src/com/vaadin/ui/Button.java
@@ -290,23 +290,41 @@ public class Button extends AbstractComponent implements
      * @param listener
      *            the Listener to be added.
      */
-    public void addListener(ClickListener listener) {
+    public void addClickListener(ClickListener listener) {
         addListener(ClickEvent.class, listener,
                 ClickListener.BUTTON_CLICK_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addClickListener(ClickListener)}
+     **/
+    @Deprecated
+    public void addListener(ClickListener listener) {
+        addClickListener(listener);
+    }
+
+    /**
      * Removes the button click listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
-    public void removeListener(ClickListener listener) {
+    public void removeClickListener(ClickListener listener) {
         removeListener(ClickEvent.class, listener,
                 ClickListener.BUTTON_CLICK_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeClickListener(ClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(ClickListener listener) {
+        removeClickListener(listener);
+    }
+
+    /**
      * Simulates a button click, notifying all server-side listeners.
      * 
      * No action is taken is the button is disabled.
@@ -341,26 +359,60 @@ public class Button extends AbstractComponent implements
     }
 
     @Override
-    public void addListener(BlurListener listener) {
+    public void addBlurListener(BlurListener listener) {
         addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void addListener(BlurListener listener) {
+        addBlurListener(listener);
+    }
+
     @Override
-    public void removeListener(BlurListener listener) {
+    public void removeBlurListener(BlurListener listener) {
         removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void removeListener(BlurListener listener) {
+        removeBlurListener(listener);
+    }
+
     @Override
-    public void addListener(FocusListener listener) {
+    public void addFocusListener(FocusListener listener) {
         addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void addListener(FocusListener listener) {
+        addFocusListener(listener);
+    }
+
     @Override
-    public void removeListener(FocusListener listener) {
+    public void removeFocusListener(FocusListener listener) {
         removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
+    }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void removeListener(FocusListener listener) {
+        removeFocusListener(listener);
     }
 
     /*
diff --git a/server/src/com/vaadin/ui/CheckBox.java b/server/src/com/vaadin/ui/CheckBox.java
index 6da86b9711..149d4779d8 100644
--- a/server/src/com/vaadin/ui/CheckBox.java
+++ b/server/src/com/vaadin/ui/CheckBox.java
@@ -119,25 +119,60 @@ public class CheckBox extends AbstractField<Boolean> {
         getState().setChecked(newValue);
     }
 
-    public void addListener(BlurListener listener) {
+    public void addBlurListener(BlurListener listener) {
         addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
-    public void removeListener(BlurListener listener) {
+    /**
+     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void addListener(BlurListener listener) {
+        addBlurListener(listener);
+    }
+
+    public void removeBlurListener(BlurListener listener) {
         removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
     }
 
-    public void addListener(FocusListener listener) {
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void removeListener(BlurListener listener) {
+        removeBlurListener(listener);
+    }
+
+    public void addFocusListener(FocusListener listener) {
         addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
-    public void removeListener(FocusListener listener) {
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void addListener(FocusListener listener) {
+        addFocusListener(listener);
+    }
+
+    public void removeFocusListener(FocusListener listener) {
         removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void removeListener(FocusListener listener) {
+        removeFocusListener(listener);
+    }
+
+    /**
      * Get the boolean value of the button state.
      * 
      * @return True iff the button is pressed down or checked.
diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java
index af19ca5b96..da3d2fd91d 100644
--- a/server/src/com/vaadin/ui/ComboBox.java
+++ b/server/src/com/vaadin/ui/ComboBox.java
@@ -16,12 +16,24 @@
 
 package com.vaadin.ui;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 import com.vaadin.data.Container;
+import com.vaadin.data.util.filter.SimpleStringFilter;
+import com.vaadin.event.FieldEvents;
+import com.vaadin.event.FieldEvents.BlurEvent;
+import com.vaadin.event.FieldEvents.BlurListener;
+import com.vaadin.event.FieldEvents.FocusEvent;
+import com.vaadin.event.FieldEvents.FocusListener;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.combobox.ComboBoxConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
 
 /**
  * A filtering dropdown single-select. Suitable for newItemsAllowed, but it's
@@ -32,11 +44,59 @@ import com.vaadin.terminal.PaintTarget;
  * 
  */
 @SuppressWarnings("serial")
-public class ComboBox extends Select {
+public class ComboBox extends AbstractSelect implements
+        AbstractSelect.Filtering, FieldEvents.BlurNotifier,
+        FieldEvents.FocusNotifier {
 
     private String inputPrompt = null;
 
     /**
+     * Holds value of property pageLength. 0 disables paging.
+     */
+    protected int pageLength = 10;
+
+    private int columns = 0;
+
+    // Current page when the user is 'paging' trough options
+    private int currentPage = -1;
+
+    private int filteringMode = Filtering.FILTERINGMODE_STARTSWITH;
+
+    private String filterstring;
+    private String prevfilterstring;
+
+    /**
+     * Number of options that pass the filter, excluding the null item if any.
+     */
+    private int filteredSize;
+
+    /**
+     * Cache of filtered options, used only by the in-memory filtering system.
+     */
+    private List<Object> filteredOptions;
+
+    /**
+     * Flag to indicate that request repaint is called by filter request only
+     */
+    private boolean optionRequest;
+
+    /**
+     * True if the container is being filtered temporarily and item set change
+     * notifications should be suppressed.
+     */
+    private boolean filteringContainer;
+
+    /**
+     * Flag to indicate whether to scroll the selected item visible (select the
+     * page on which it is) when opening the popup or not. Only applies to
+     * single select mode.
+     * 
+     * This requires finding the index of the item, which can be expensive in
+     * many large lazy loading containers.
+     */
+    private boolean scrollToSelectedItem = true;
+
+    /**
      * If text input is not allowed, the ComboBox behaves like a pretty
      * NativeSelect - the user can not enter any text and clicking the text
      * field opens the drop down with options
@@ -89,11 +149,139 @@ public class ComboBox extends Select {
         if (inputPrompt != null) {
             target.addAttribute(ComboBoxConstants.ATTR_INPUTPROMPT, inputPrompt);
         }
-        super.paintContent(target);
 
         if (!textInputAllowed) {
             target.addAttribute(ComboBoxConstants.ATTR_NO_TEXT_INPUT, true);
         }
+
+        // clear caption change listeners
+        getCaptionChangeListener().clear();
+
+        // The tab ordering number
+        if (getTabIndex() != 0) {
+            target.addAttribute("tabindex", getTabIndex());
+        }
+
+        // If the field is modified, but not committed, set modified attribute
+        if (isModified()) {
+            target.addAttribute("modified", true);
+        }
+
+        if (isNewItemsAllowed()) {
+            target.addAttribute("allownewitem", true);
+        }
+
+        boolean needNullSelectOption = false;
+        if (isNullSelectionAllowed()) {
+            target.addAttribute("nullselect", true);
+            needNullSelectOption = (getNullSelectionItemId() == null);
+            if (!needNullSelectOption) {
+                target.addAttribute("nullselectitem", true);
+            }
+        }
+
+        // Constructs selected keys array
+        String[] selectedKeys = new String[(getValue() == null
+                && getNullSelectionItemId() == null ? 0 : 1)];
+
+        target.addAttribute("pagelength", pageLength);
+
+        target.addAttribute("filteringmode", getFilteringMode());
+
+        // Paints the options and create array of selected id keys
+        int keyIndex = 0;
+
+        target.startTag("options");
+
+        if (currentPage < 0) {
+            optionRequest = false;
+            currentPage = 0;
+            filterstring = "";
+        }
+
+        boolean nullFilteredOut = filterstring != null
+                && !"".equals(filterstring)
+                && filteringMode != Filtering.FILTERINGMODE_OFF;
+        // null option is needed and not filtered out, even if not on current
+        // page
+        boolean nullOptionVisible = needNullSelectOption && !nullFilteredOut;
+
+        // first try if using container filters is possible
+        List<?> options = getOptionsWithFilter(nullOptionVisible);
+        if (null == options) {
+            // not able to use container filters, perform explicit in-memory
+            // filtering
+            options = getFilteredOptions();
+            filteredSize = options.size();
+            options = sanitetizeList(options, nullOptionVisible);
+        }
+
+        final boolean paintNullSelection = needNullSelectOption
+                && currentPage == 0 && !nullFilteredOut;
+
+        if (paintNullSelection) {
+            target.startTag("so");
+            target.addAttribute("caption", "");
+            target.addAttribute("key", "");
+            target.endTag("so");
+        }
+
+        final Iterator<?> i = options.iterator();
+        // Paints the available selection options from data source
+
+        while (i.hasNext()) {
+
+            final Object id = i.next();
+
+            if (!isNullSelectionAllowed() && id != null
+                    && id.equals(getNullSelectionItemId()) && !isSelected(id)) {
+                continue;
+            }
+
+            // Gets the option attribute values
+            final String key = itemIdMapper.key(id);
+            final String caption = getItemCaption(id);
+            final Resource icon = getItemIcon(id);
+            getCaptionChangeListener().addNotifierForItem(id);
+
+            // Paints the option
+            target.startTag("so");
+            if (icon != null) {
+                target.addAttribute("icon", icon);
+            }
+            target.addAttribute("caption", caption);
+            if (id != null && id.equals(getNullSelectionItemId())) {
+                target.addAttribute("nullselection", true);
+            }
+            target.addAttribute("key", key);
+            if (isSelected(id) && keyIndex < selectedKeys.length) {
+                target.addAttribute("selected", true);
+                selectedKeys[keyIndex++] = key;
+            }
+            target.endTag("so");
+        }
+        target.endTag("options");
+
+        target.addAttribute("totalitems", size()
+                + (needNullSelectOption ? 1 : 0));
+        if (filteredSize > 0 || nullOptionVisible) {
+            target.addAttribute("totalMatches", filteredSize
+                    + (nullOptionVisible ? 1 : 0));
+        }
+
+        // Paint variables
+        target.addVariable(this, "selected", selectedKeys);
+        if (isNewItemsAllowed()) {
+            target.addVariable(this, "newitem", "");
+        }
+
+        target.addVariable(this, "filter", filterstring);
+        target.addVariable(this, "page", currentPage);
+
+        currentPage = -1; // current page is always set by client
+
+        optionRequest = true;
+
     }
 
     /**
@@ -125,4 +313,504 @@ public class ComboBox extends Select {
         return textInputAllowed;
     }
 
+    /**
+     * Returns the filtered options for the current page using a container
+     * filter.
+     * 
+     * As a size effect, {@link #filteredSize} is set to the total number of
+     * items passing the filter.
+     * 
+     * The current container must be {@link Filterable} and {@link Indexed}, and
+     * the filtering mode must be suitable for container filtering (tested with
+     * {@link #canUseContainerFilter()}).
+     * 
+     * Use {@link #getFilteredOptions()} and
+     * {@link #sanitetizeList(List, boolean)} if this is not the case.
+     * 
+     * @param needNullSelectOption
+     * @return filtered list of options (may be empty) or null if cannot use
+     *         container filters
+     */
+    protected List<?> getOptionsWithFilter(boolean needNullSelectOption) {
+        Container container = getContainerDataSource();
+
+        if (pageLength == 0) {
+            // no paging: return all items
+            filteredSize = container.size();
+            return new ArrayList<Object>(container.getItemIds());
+        }
+
+        if (!(container instanceof Filterable)
+                || !(container instanceof Indexed)
+                || getItemCaptionMode() != ITEM_CAPTION_MODE_PROPERTY) {
+            return null;
+        }
+
+        Filterable filterable = (Filterable) container;
+
+        Filter filter = buildFilter(filterstring, filteringMode);
+
+        // adding and removing filters leads to extraneous item set
+        // change events from the underlying container, but the ComboBox does
+        // not process or propagate them based on the flag filteringContainer
+        if (filter != null) {
+            filteringContainer = true;
+            filterable.addContainerFilter(filter);
+        }
+
+        Indexed indexed = (Indexed) container;
+
+        int indexToEnsureInView = -1;
+
+        // if not an option request (item list when user changes page), go
+        // to page with the selected item after filtering if accepted by
+        // filter
+        Object selection = getValue();
+        if (isScrollToSelectedItem() && !optionRequest && selection != null) {
+            // ensure proper page
+            indexToEnsureInView = indexed.indexOfId(selection);
+        }
+
+        filteredSize = container.size();
+        currentPage = adjustCurrentPage(currentPage, needNullSelectOption,
+                indexToEnsureInView, filteredSize);
+        int first = getFirstItemIndexOnCurrentPage(needNullSelectOption,
+                filteredSize);
+        int last = getLastItemIndexOnCurrentPage(needNullSelectOption,
+                filteredSize, first);
+
+        List<Object> options = new ArrayList<Object>();
+        for (int i = first; i <= last && i < filteredSize; ++i) {
+            options.add(indexed.getIdByIndex(i));
+        }
+
+        // to the outside, filtering should not be visible
+        if (filter != null) {
+            filterable.removeContainerFilter(filter);
+            filteringContainer = false;
+        }
+
+        return options;
+    }
+
+    /**
+     * Constructs a filter instance to use when using a Filterable container in
+     * the <code>ITEM_CAPTION_MODE_PROPERTY</code> mode.
+     * 
+     * Note that the client side implementation expects the filter string to
+     * apply to the item caption string it sees, so changing the behavior of
+     * this method can cause problems.
+     * 
+     * @param filterString
+     * @param filteringMode
+     * @return
+     */
+    protected Filter buildFilter(String filterString, int filteringMode) {
+        Filter filter = null;
+
+        if (null != filterString && !"".equals(filterString)) {
+            switch (filteringMode) {
+            case Filtering.FILTERINGMODE_OFF:
+                break;
+            case Filtering.FILTERINGMODE_STARTSWITH:
+                filter = new SimpleStringFilter(getItemCaptionPropertyId(),
+                        filterString, true, true);
+                break;
+            case Filtering.FILTERINGMODE_CONTAINS:
+                filter = new SimpleStringFilter(getItemCaptionPropertyId(),
+                        filterString, true, false);
+                break;
+            }
+        }
+        return filter;
+    }
+
+    @Override
+    public void containerItemSetChange(Container.ItemSetChangeEvent event) {
+        if (!filteringContainer) {
+            super.containerItemSetChange(event);
+        }
+    }
+
+    /**
+     * Makes correct sublist of given list of options.
+     * 
+     * If paint is not an option request (affected by page or filter change),
+     * page will be the one where possible selection exists.
+     * 
+     * Detects proper first and last item in list to return right page of
+     * options. Also, if the current page is beyond the end of the list, it will
+     * be adjusted.
+     * 
+     * @param options
+     * @param needNullSelectOption
+     *            flag to indicate if nullselect option needs to be taken into
+     *            consideration
+     */
+    private List<?> sanitetizeList(List<?> options, boolean needNullSelectOption) {
+
+        if (pageLength != 0 && options.size() > pageLength) {
+
+            int indexToEnsureInView = -1;
+
+            // if not an option request (item list when user changes page), go
+            // to page with the selected item after filtering if accepted by
+            // filter
+            Object selection = getValue();
+            if (isScrollToSelectedItem() && !optionRequest && selection != null) {
+                // ensure proper page
+                indexToEnsureInView = options.indexOf(selection);
+            }
+
+            int size = options.size();
+            currentPage = adjustCurrentPage(currentPage, needNullSelectOption,
+                    indexToEnsureInView, size);
+            int first = getFirstItemIndexOnCurrentPage(needNullSelectOption,
+                    size);
+            int last = getLastItemIndexOnCurrentPage(needNullSelectOption,
+                    size, first);
+            return options.subList(first, last + 1);
+        } else {
+            return options;
+        }
+    }
+
+    /**
+     * Returns the index of the first item on the current page. The index is to
+     * the underlying (possibly filtered) contents. The null item, if any, does
+     * not have an index but takes up a slot on the first page.
+     * 
+     * @param needNullSelectOption
+     *            true if a null option should be shown before any other options
+     *            (takes up the first slot on the first page, not counted in
+     *            index)
+     * @param size
+     *            number of items after filtering (not including the null item,
+     *            if any)
+     * @return first item to show on the UI (index to the filtered list of
+     *         options, not taking the null item into consideration if any)
+     */
+    private int getFirstItemIndexOnCurrentPage(boolean needNullSelectOption,
+            int size) {
+        // Not all options are visible, find out which ones are on the
+        // current "page".
+        int first = currentPage * pageLength;
+        if (needNullSelectOption && currentPage > 0) {
+            first--;
+        }
+        return first;
+    }
+
+    /**
+     * Returns the index of the last item on the current page. The index is to
+     * the underlying (possibly filtered) contents. If needNullSelectOption is
+     * true, the null item takes up the first slot on the first page,
+     * effectively reducing the first page size by one.
+     * 
+     * @param needNullSelectOption
+     *            true if a null option should be shown before any other options
+     *            (takes up the first slot on the first page, not counted in
+     *            index)
+     * @param size
+     *            number of items after filtering (not including the null item,
+     *            if any)
+     * @param first
+     *            index in the filtered view of the first item of the page
+     * @return index in the filtered view of the last item on the page
+     */
+    private int getLastItemIndexOnCurrentPage(boolean needNullSelectOption,
+            int size, int first) {
+        // page length usable for non-null items
+        int effectivePageLength = pageLength
+                - (needNullSelectOption && (currentPage == 0) ? 1 : 0);
+        return Math.min(size - 1, first + effectivePageLength - 1);
+    }
+
+    /**
+     * Adjusts the index of the current page if necessary: make sure the current
+     * page is not after the end of the contents, and optionally go to the page
+     * containg a specific item. There are no side effects but the adjusted page
+     * index is returned.
+     * 
+     * @param page
+     *            page number to use as the starting point
+     * @param needNullSelectOption
+     *            true if a null option should be shown before any other options
+     *            (takes up the first slot on the first page, not counted in
+     *            index)
+     * @param indexToEnsureInView
+     *            index of an item that should be included on the page (in the
+     *            data set, not counting the null item if any), -1 for none
+     * @param size
+     *            number of items after filtering (not including the null item,
+     *            if any)
+     */
+    private int adjustCurrentPage(int page, boolean needNullSelectOption,
+            int indexToEnsureInView, int size) {
+        if (indexToEnsureInView != -1) {
+            int newPage = (indexToEnsureInView + (needNullSelectOption ? 1 : 0))
+                    / pageLength;
+            page = newPage;
+        }
+        // adjust the current page if beyond the end of the list
+        if (page * pageLength > size) {
+            page = (size + (needNullSelectOption ? 1 : 0)) / pageLength;
+        }
+        return page;
+    }
+
+    /**
+     * Filters the options in memory and returns the full filtered list.
+     * 
+     * This can be less efficient than using container filters, so use
+     * {@link #getOptionsWithFilter(boolean)} if possible (filterable container
+     * and suitable item caption mode etc.).
+     * 
+     * @return
+     */
+    protected List<?> getFilteredOptions() {
+        if (null == filterstring || "".equals(filterstring)
+                || Filtering.FILTERINGMODE_OFF == filteringMode) {
+            prevfilterstring = null;
+            filteredOptions = new LinkedList<Object>(getItemIds());
+            return filteredOptions;
+        }
+
+        if (filterstring.equals(prevfilterstring)) {
+            return filteredOptions;
+        }
+
+        Collection<?> items;
+        if (prevfilterstring != null
+                && filterstring.startsWith(prevfilterstring)) {
+            items = filteredOptions;
+        } else {
+            items = getItemIds();
+        }
+        prevfilterstring = filterstring;
+
+        filteredOptions = new LinkedList<Object>();
+        for (final Iterator<?> it = items.iterator(); it.hasNext();) {
+            final Object itemId = it.next();
+            String caption = getItemCaption(itemId);
+            if (caption == null || caption.equals("")) {
+                continue;
+            } else {
+                caption = caption.toLowerCase();
+            }
+            switch (filteringMode) {
+            case Filtering.FILTERINGMODE_CONTAINS:
+                if (caption.indexOf(filterstring) > -1) {
+                    filteredOptions.add(itemId);
+                }
+                break;
+            case Filtering.FILTERINGMODE_STARTSWITH:
+            default:
+                if (caption.startsWith(filterstring)) {
+                    filteredOptions.add(itemId);
+                }
+                break;
+            }
+        }
+
+        return filteredOptions;
+    }
+
+    /**
+     * Invoked when the value of a variable has changed.
+     * 
+     * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object,
+     *      java.util.Map)
+     */
+    @Override
+    public void changeVariables(Object source, Map<String, Object> variables) {
+        // Not calling super.changeVariables due the history of select
+        // component hierarchy
+
+        // Selection change
+        if (variables.containsKey("selected")) {
+            final String[] ka = (String[]) variables.get("selected");
+
+            // Single select mode
+            if (ka.length == 0) {
+
+                // Allows deselection only if the deselected item is visible
+                final Object current = getValue();
+                final Collection<?> visible = getVisibleItemIds();
+                if (visible != null && visible.contains(current)) {
+                    setValue(null, true);
+                }
+            } else {
+                final Object id = itemIdMapper.get(ka[0]);
+                if (id != null && id.equals(getNullSelectionItemId())) {
+                    setValue(null, true);
+                } else {
+                    setValue(id, true);
+                }
+            }
+        }
+
+        String newFilter;
+        if ((newFilter = (String) variables.get("filter")) != null) {
+            // this is a filter request
+            currentPage = ((Integer) variables.get("page")).intValue();
+            filterstring = newFilter;
+            if (filterstring != null) {
+                filterstring = filterstring.toLowerCase();
+            }
+            requestRepaint();
+        } else if (isNewItemsAllowed()) {
+            // New option entered (and it is allowed)
+            final String newitem = (String) variables.get("newitem");
+            if (newitem != null && newitem.length() > 0) {
+                getNewItemHandler().addNewItem(newitem);
+                // rebuild list
+                filterstring = null;
+                prevfilterstring = null;
+            }
+        }
+
+        if (variables.containsKey(FocusEvent.EVENT_ID)) {
+            fireEvent(new FocusEvent(this));
+        }
+        if (variables.containsKey(BlurEvent.EVENT_ID)) {
+            fireEvent(new BlurEvent(this));
+        }
+
+    }
+
+    @Override
+    @Deprecated
+    public void requestRepaint() {
+        markAsDirty();
+    }
+
+    @Override
+    public void setFilteringMode(int filteringMode) {
+        this.filteringMode = filteringMode;
+    }
+
+    @Override
+    public int getFilteringMode() {
+        return filteringMode;
+    }
+
+    public void addBlurListener(BlurListener listener) {
+        addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
+                BlurListener.blurMethod);
+    }
+
+    /**
+     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void addListener(BlurListener listener) {
+        addBlurListener(listener);
+    }
+
+    @Override
+    public void removeBlurListener(BlurListener listener) {
+        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
+    }
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void removeListener(BlurListener listener) {
+        removeBlurListener(listener);
+    }
+
+    @Override
+    public void addFocusListener(FocusListener listener) {
+        addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
+                FocusListener.focusMethod);
+    }
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void addListener(FocusListener listener) {
+        addFocusListener(listener);
+    }
+
+    @Override
+    public void removeFocusListener(FocusListener listener) {
+        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
+    }
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void removeListener(FocusListener listener) {
+        removeFocusListener(listener);
+    }
+
+    /**
+     * ComboBox does not support multi select mode.
+     * 
+     * @deprecated use {@link ListSelect}, {@link OptionGroup} or
+     *             {@link TwinColSelect} instead
+     * @see com.vaadin.ui.AbstractSelect#setMultiSelect(boolean)
+     * @throws UnsupportedOperationException
+     *             if trying to activate multiselect mode
+     */
+    @Deprecated
+    @Override
+    public void setMultiSelect(boolean multiSelect) {
+        if (multiSelect) {
+            throw new UnsupportedOperationException("Multiselect not supported");
+        }
+    }
+
+    /**
+     * ComboBox does not support multi select mode.
+     * 
+     * @deprecated use {@link ListSelect}, {@link OptionGroup} or
+     *             {@link TwinColSelect} instead
+     * 
+     * @see com.vaadin.ui.AbstractSelect#isMultiSelect()
+     * 
+     * @return false
+     */
+    @Deprecated
+    @Override
+    public boolean isMultiSelect() {
+        return false;
+    }
+
+    /**
+     * Sets whether to scroll the selected item visible (directly open the page
+     * on which it is) when opening the combo box popup or not. Only applies to
+     * single select mode.
+     * 
+     * This requires finding the index of the item, which can be expensive in
+     * many large lazy loading containers.
+     * 
+     * @param scrollToSelectedItem
+     *            true to find the page with the selected item when opening the
+     *            selection popup
+     */
+    public void setScrollToSelectedItem(boolean scrollToSelectedItem) {
+        this.scrollToSelectedItem = scrollToSelectedItem;
+    }
+
+    /**
+     * Returns true if the select should find the page with the selected item
+     * when opening the popup (single select combo box only).
+     * 
+     * @see #setScrollToSelectedItem(boolean)
+     * 
+     * @return true if the page with the selected item will be shown when
+     *         opening the popup
+     */
+    public boolean isScrollToSelectedItem() {
+        return scrollToSelectedItem;
+    }
+
 }
diff --git a/server/src/com/vaadin/ui/Component.java b/server/src/com/vaadin/ui/Component.java
index 0559cc5e6a..01033ff560 100644
--- a/server/src/com/vaadin/ui/Component.java
+++ b/server/src/com/vaadin/ui/Component.java
@@ -23,11 +23,11 @@ import java.util.Locale;
 
 import com.vaadin.Application;
 import com.vaadin.event.FieldEvents;
-import com.vaadin.terminal.ErrorMessage;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Sizeable;
-import com.vaadin.terminal.VariableOwner;
-import com.vaadin.terminal.gwt.server.ClientConnector;
+import com.vaadin.server.ClientConnector;
+import com.vaadin.server.ErrorMessage;
+import com.vaadin.server.Resource;
+import com.vaadin.server.Sizeable;
+import com.vaadin.server.VariableOwner;
 
 /**
  * {@code Component} is the top-level interface that is and must be implemented
@@ -136,8 +136,9 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
     public void setStyleName(String style);
 
     /**
-     * Adds a style name to component. The style name will be rendered as a HTML
-     * class name, which can be used in a CSS definition.
+     * Adds one or more style names to this component. Multiple styles can be
+     * specified as a space-separated list of style names. The style name will
+     * be rendered as a HTML class name, which can be used in a CSS definition.
      * 
      * <pre>
      * Label label = new Label(&quot;This text has style&quot;);
@@ -462,7 +463,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * 
      * <p>
      * The image is loaded by the browser from a resource, typically a
-     * {@link com.vaadin.terminal.ThemeResource}.
+     * {@link com.vaadin.server.ThemeResource}.
      * </p>
      * 
      * <pre>
diff --git a/server/src/com/vaadin/ui/ComponentContainer.java b/server/src/com/vaadin/ui/ComponentContainer.java
index c2a75f9313..cee6d7300b 100644
--- a/server/src/com/vaadin/ui/ComponentContainer.java
+++ b/server/src/com/vaadin/ui/ComponentContainer.java
@@ -94,6 +94,13 @@ public interface ComponentContainer extends HasComponents {
      * @param listener
      *            the listener to add.
      */
+    public void addComponentAttachListener(ComponentAttachListener listener);
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addComponentAttachListener(ComponentAttachListener)}
+     **/
+    @Deprecated
     public void addListener(ComponentAttachListener listener);
 
     /**
@@ -102,16 +109,37 @@ public interface ComponentContainer extends HasComponents {
      * @param listener
      *            the listener to removed.
      */
+    public void removeComponentAttachListener(ComponentAttachListener listener);
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeComponentAttachListener(ComponentAttachListener)}
+     **/
+    @Deprecated
     public void removeListener(ComponentAttachListener listener);
 
     /**
      * Listens the component detach events.
      */
+    public void addComponentDetachListener(ComponentDetachListener listener);
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addComponentDetachListener(ComponentDetachListener)}
+     **/
+    @Deprecated
     public void addListener(ComponentDetachListener listener);
 
     /**
      * Stops the listening component detach events.
      */
+    public void removeComponentDetachListener(ComponentDetachListener listener);
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeComponentDetachListener(ComponentDetachListener)}
+     **/
+    @Deprecated
     public void removeListener(ComponentDetachListener listener);
 
     /**
diff --git a/server/src/com/vaadin/ui/ConnectorTracker.java b/server/src/com/vaadin/ui/ConnectorTracker.java
index b44189f838..3140c26525 100644
--- a/server/src/com/vaadin/ui/ConnectorTracker.java
+++ b/server/src/com/vaadin/ui/ConnectorTracker.java
@@ -25,9 +25,10 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.terminal.AbstractClientConnector;
-import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
-import com.vaadin.terminal.gwt.server.ClientConnector;
+import com.vaadin.server.AbstractClientConnector;
+import com.vaadin.server.AbstractCommunicationManager;
+import com.vaadin.server.ClientConnector;
+import com.vaadin.server.GlobalResourceHandler;
 
 /**
  * A class which takes care of book keeping of {@link ClientConnector}s for a
@@ -42,7 +43,7 @@ import com.vaadin.terminal.gwt.server.ClientConnector;
  * client when the following response is sent. A connector is dirty when an
  * operation has been performed on it on the server and as a result of this
  * operation new information needs to be sent to its
- * {@link com.vaadin.terminal.gwt.client.ServerConnector}.
+ * {@link com.vaadin.client.ServerConnector}.
  * </p>
  * 
  * @author Vaadin Ltd
@@ -141,11 +142,22 @@ public class ConnectorTracker implements Serializable {
         getLogger().fine(
                 "Unregistered " + connector.getClass().getSimpleName() + " ("
                         + connectorId + ")");
+
+        removeFromGlobalResourceHandler(connector);
         connectorIdToConnector.remove(connectorId);
         uninitializedConnectors.remove(connector);
         diffStates.remove(connector);
     }
 
+    private void removeFromGlobalResourceHandler(ClientConnector connector) {
+        GlobalResourceHandler globalResourceHandler = uI.getApplication()
+                .getGlobalResourceHandler(false);
+        // Nothing to do if there is no handler
+        if (globalResourceHandler != null) {
+            globalResourceHandler.unregisterConnector(connector);
+        }
+    }
+
     /**
      * Checks whether the given connector has already been initialized in the
      * browser. The given connector should be registered with this connector
@@ -224,6 +236,8 @@ public class ConnectorTracker implements Serializable {
                                 "cleanConnectorMap unregistered connector "
                                         + getConnectorAndParentInfo(connector)
                                         + "). This should have been done when the connector was detached.");
+
+                removeFromGlobalResourceHandler(connector);
                 uninitializedConnectors.remove(connector);
                 diffStates.remove(connector);
                 iterator.remove();
diff --git a/server/src/com/vaadin/ui/CssLayout.java b/server/src/com/vaadin/ui/CssLayout.java
index b16bcf31df..b63c8573ba 100644
--- a/server/src/com/vaadin/ui/CssLayout.java
+++ b/server/src/com/vaadin/ui/CssLayout.java
@@ -281,19 +281,37 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier {
     }
 
     @Override
-    public void addListener(LayoutClickListener listener) {
+    public void addLayoutClickListener(LayoutClickListener listener) {
         addListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER,
                 LayoutClickEvent.class, listener,
                 LayoutClickListener.clickMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addLayoutClickListener(LayoutClickListener)}
+     **/
+    @Deprecated
+    public void addListener(LayoutClickListener listener) {
+        addLayoutClickListener(listener);
+    }
+
     @Override
-    public void removeListener(LayoutClickListener listener) {
+    public void removeLayoutClickListener(LayoutClickListener listener) {
         removeListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER,
                 LayoutClickEvent.class, listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeLayoutClickListener(LayoutClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(LayoutClickListener listener) {
+        removeLayoutClickListener(listener);
+    }
+
+    /**
      * Returns the index of the given component.
      * 
      * @param component
diff --git a/server/src/com/vaadin/ui/CustomField.java b/server/src/com/vaadin/ui/CustomField.java
index 9ac5e2defb..7bb6e66cf9 100644
--- a/server/src/com/vaadin/ui/CustomField.java
+++ b/server/src/com/vaadin/ui/CustomField.java
@@ -221,27 +221,64 @@ public abstract class CustomField<T> extends AbstractField<T> implements
     }
 
     @Override
-    public void addListener(ComponentAttachListener listener) {
+    public void addComponentAttachListener(ComponentAttachListener listener) {
         addListener(ComponentContainer.ComponentAttachEvent.class, listener,
                 COMPONENT_ATTACHED_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)}
+     **/
+    @Deprecated
+    public void addListener(ComponentAttachListener listener) {
+        addComponentAttachListener(listener);
+    }
+
     @Override
-    public void removeListener(ComponentAttachListener listener) {
+    public void removeComponentAttachListener(ComponentAttachListener listener) {
         removeListener(ComponentContainer.ComponentAttachEvent.class, listener,
                 COMPONENT_ATTACHED_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)}
+     **/
+    @Deprecated
+    public void removeListener(ComponentAttachListener listener) {
+        removeComponentAttachListener(listener);
+    }
+
     @Override
-    public void addListener(ComponentDetachListener listener) {
+    public void addComponentDetachListener(ComponentDetachListener listener) {
         // content never detached
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)}
+     **/
+    @Deprecated
+    public void addListener(ComponentDetachListener listener) {
+        addComponentDetachListener(listener);
+
+    }
+
     @Override
-    public void removeListener(ComponentDetachListener listener) {
+    public void removeComponentDetachListener(ComponentDetachListener listener) {
         // content never detached
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)}
+     **/
+    @Deprecated
+    public void removeListener(ComponentDetachListener listener) {
+        removeComponentDetachListener(listener);
+    }
+
     @Override
     public boolean isComponentVisible(Component childComponent) {
         return true;
diff --git a/server/src/com/vaadin/ui/CustomLayout.java b/server/src/com/vaadin/ui/CustomLayout.java
index 54308b99c3..f747b6ff3b 100644
--- a/server/src/com/vaadin/ui/CustomLayout.java
+++ b/server/src/com/vaadin/ui/CustomLayout.java
@@ -24,11 +24,11 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
+import com.vaadin.server.JsonPaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.ui.customlayout.CustomLayoutState;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
-import com.vaadin.terminal.gwt.server.JsonPaintTarget;
 
 /**
  * <p>
@@ -58,7 +58,7 @@ import com.vaadin.terminal.gwt.server.JsonPaintTarget;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class CustomLayout extends AbstractLayout implements Vaadin6Component {
+public class CustomLayout extends AbstractLayout implements LegacyComponent {
 
     private static final int BUFFER_SIZE = 10000;
 
diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java
index 828fa3b21d..712034a562 100644
--- a/server/src/com/vaadin/ui/DateField.java
+++ b/server/src/com/vaadin/ui/DateField.java
@@ -36,10 +36,10 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.ui.datefield.DateFieldConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * <p>
@@ -61,7 +61,7 @@ import com.vaadin.terminal.Vaadin6Component;
  */
 @SuppressWarnings("serial")
 public class DateField extends AbstractField<Date> implements
-        FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, Vaadin6Component {
+        FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, LegacyComponent {
 
     /**
      * Resolutions for DateFields
@@ -741,28 +741,63 @@ public class DateField extends AbstractField<Date> implements
     }
 
     @Override
-    public void addListener(FocusListener listener) {
+    public void addFocusListener(FocusListener listener) {
         addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void addListener(FocusListener listener) {
+        addFocusListener(listener);
+    }
+
     @Override
-    public void removeListener(FocusListener listener) {
+    public void removeFocusListener(FocusListener listener) {
         removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void removeListener(FocusListener listener) {
+        removeFocusListener(listener);
+    }
+
     @Override
-    public void addListener(BlurListener listener) {
+    public void addBlurListener(BlurListener listener) {
         addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void addListener(BlurListener listener) {
+        addBlurListener(listener);
+    }
+
     @Override
-    public void removeListener(BlurListener listener) {
+    public void removeBlurListener(BlurListener listener) {
         removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void removeListener(BlurListener listener) {
+        removeBlurListener(listener);
+    }
+
+    /**
      * Checks whether ISO 8601 week numbers are shown in the date selector.
      * 
      * @return true if week numbers are shown, false otherwise.
diff --git a/server/src/com/vaadin/ui/DragAndDropWrapper.java b/server/src/com/vaadin/ui/DragAndDropWrapper.java
index ec805ecf46..d3f3e23448 100644
--- a/server/src/com/vaadin/ui/DragAndDropWrapper.java
+++ b/server/src/com/vaadin/ui/DragAndDropWrapper.java
@@ -29,18 +29,18 @@ import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.DropTarget;
 import com.vaadin.event.dd.TargetDetails;
 import com.vaadin.event.dd.TargetDetailsImpl;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.StreamVariable;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.dd.HorizontalDropLocation;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.shared.ui.draganddropwrapper.DragAndDropWrapperConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.StreamVariable;
-import com.vaadin.terminal.Vaadin6Component;
 
 @SuppressWarnings("serial")
 public class DragAndDropWrapper extends CustomComponent implements DropTarget,
-        DragSource, Vaadin6Component {
+        DragSource, LegacyComponent {
 
     public class WrapperTransferable extends TransferableImpl {
 
@@ -212,7 +212,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget,
 
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
-        // TODO Remove once Vaadin6Component is no longer implemented
+        // TODO Remove once LegacyComponent is no longer implemented
     }
 
     @Override
diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java
index 41b93d0b27..b3afb52249 100644
--- a/server/src/com/vaadin/ui/Embedded.java
+++ b/server/src/com/vaadin/ui/Embedded.java
@@ -22,23 +22,27 @@ import java.util.Map;
 
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.embedded.EmbeddedConstants;
 import com.vaadin.shared.ui.embedded.EmbeddedServerRpc;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * Component for embedding external objects.
+ * <p>
+ * As of Vaadin 7.0, the {@link Image}, {@link Flash}, and
+ * {@link EmbeddedBrowser} components should be used instead of
+ * <code>Embedded</code> whenever appropriate.
  * 
  * @author Vaadin Ltd.
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class Embedded extends AbstractComponent implements Vaadin6Component {
+public class Embedded extends AbstractComponent implements LegacyComponent {
 
     /**
      * General object type.
@@ -47,12 +51,18 @@ public class Embedded extends AbstractComponent implements Vaadin6Component {
 
     /**
      * Image types.
+     * 
+     * @deprecated As of 7.0, use the {@link Image} component instead.
      */
+    @Deprecated
     public static final int TYPE_IMAGE = 1;
 
     /**
      * Browser ("iframe") type.
+     * 
+     * @deprecated As of 7.0, use the {@link EmbeddedBrowser} component instead.
      */
+    @Deprecated
     public static final int TYPE_BROWSER = 2;
 
     /**
@@ -452,9 +462,9 @@ public class Embedded extends AbstractComponent implements Vaadin6Component {
      * <p>
      * This can be one of the following:
      * <ul>
-     * <li>TYPE_OBJECT <i>(This is the default)</i>
-     * <li>TYPE_IMAGE
-     * <li>TYPE_BROWSER
+     * <li>{@link #TYPE_OBJECT} <i>(This is the default)</i>
+     * <li>{@link #TYPE_IMAGE} <i>(Deprecated)</i>
+     * <li>{@link #TYPE_BROWSER} <i>(Deprecated)</i>
      * </ul>
      * </p>
      * 
@@ -516,26 +526,44 @@ public class Embedded extends AbstractComponent implements Vaadin6Component {
      * @param listener
      *            The listener to add
      */
-    public void addListener(ClickListener listener) {
+    public void addClickListener(ClickListener listener) {
         addListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class, listener,
                 ClickListener.clickMethod);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addClickListener(ClickListener)}
+     **/
+    @Deprecated
+    public void addListener(ClickListener listener) {
+        addClickListener(listener);
+    }
+
+    /**
      * Remove a click listener from the component. The listener should earlier
      * have been added using {@link #addListener(ClickListener)}.
      * 
      * @param listener
      *            The listener to remove
      */
-    public void removeListener(ClickListener listener) {
+    public void removeClickListener(ClickListener listener) {
         removeListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class,
                 listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeClickListener(ClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(ClickListener listener) {
+        removeClickListener(listener);
+    }
+
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
-        // TODO Remove once Vaadin6Component is no longer implemented
+        // TODO Remove once LegacyComponent is no longer implemented
     }
 
 }
diff --git a/server/src/com/vaadin/ui/Form.java b/server/src/com/vaadin/ui/Form.java
index 55404b2e6b..7e77117acb 100644
--- a/server/src/com/vaadin/ui/Form.java
+++ b/server/src/com/vaadin/ui/Form.java
@@ -36,14 +36,14 @@ import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.Action.ShortcutNotifier;
 import com.vaadin.event.ActionManager;
+import com.vaadin.server.AbstractErrorMessage;
+import com.vaadin.server.CompositeErrorMessage;
+import com.vaadin.server.ErrorMessage;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.UserError;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.ui.form.FormState;
-import com.vaadin.terminal.AbstractErrorMessage;
-import com.vaadin.terminal.CompositeErrorMessage;
-import com.vaadin.terminal.ErrorMessage;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.UserError;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * Form component provides easy way of creating and managing sets fields.
@@ -79,7 +79,7 @@ import com.vaadin.terminal.Vaadin6Component;
 @Deprecated
 public class Form extends AbstractField<Object> implements Item.Editor,
         Buffered, Item, Validatable, Action.Notifier, HasComponents,
-        Vaadin6Component {
+        LegacyComponent {
 
     private Object propertyValue;
 
diff --git a/server/src/com/vaadin/ui/GridLayout.java b/server/src/com/vaadin/ui/GridLayout.java
index 3870b71611..21602c6802 100644
--- a/server/src/com/vaadin/ui/GridLayout.java
+++ b/server/src/com/vaadin/ui/GridLayout.java
@@ -27,16 +27,16 @@ import java.util.Map.Entry;
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.event.LayoutEvents.LayoutClickNotifier;
+import com.vaadin.server.LegacyPaint;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.gridlayout.GridLayoutServerRpc;
 import com.vaadin.shared.ui.gridlayout.GridLayoutState;
-import com.vaadin.terminal.LegacyPaint;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * A layout where the components are laid out on a grid using cell coordinates.
@@ -65,7 +65,7 @@ import com.vaadin.terminal.Vaadin6Component;
 @SuppressWarnings("serial")
 public class GridLayout extends AbstractLayout implements
         Layout.AlignmentHandler, Layout.SpacingHandler, Layout.MarginHandler,
-        LayoutClickNotifier, Vaadin6Component {
+        LayoutClickNotifier, LegacyComponent {
 
     private GridLayoutServerRpc rpc = new GridLayoutServerRpc() {
 
@@ -447,7 +447,7 @@ public class GridLayout extends AbstractLayout implements
 
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
-        // TODO Remove once Vaadin6Component is no longer implemented
+        // TODO Remove once LegacyComponent is no longer implemented
     }
 
     /**
@@ -1354,18 +1354,38 @@ public class GridLayout extends AbstractLayout implements
     }
 
     @Override
-    public void addListener(LayoutClickListener listener) {
+    public void addLayoutClickListener(LayoutClickListener listener) {
         addListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER,
                 LayoutClickEvent.class, listener,
                 LayoutClickListener.clickMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addLayoutClickListener(LayoutClickListener)}
+     **/
     @Override
-    public void removeListener(LayoutClickListener listener) {
+    @Deprecated
+    public void addListener(LayoutClickListener listener) {
+        addLayoutClickListener(listener);
+    }
+
+    @Override
+    public void removeLayoutClickListener(LayoutClickListener listener) {
         removeListener(EventId.LAYOUT_CLICK_EVENT_IDENTIFIER,
                 LayoutClickEvent.class, listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeLayoutClickListener(LayoutClickListener)}
+     **/
+    @Override
+    @Deprecated
+    public void removeListener(LayoutClickListener listener) {
+        removeLayoutClickListener(listener);
+    }
+
     /*
      * (non-Javadoc)
      * 
diff --git a/server/src/com/vaadin/ui/Html5File.java b/server/src/com/vaadin/ui/Html5File.java
index 596f83a1d8..47af708160 100644
--- a/server/src/com/vaadin/ui/Html5File.java
+++ b/server/src/com/vaadin/ui/Html5File.java
@@ -18,7 +18,7 @@ package com.vaadin.ui;
 import java.io.Serializable;
 
 import com.vaadin.event.dd.DropHandler;
-import com.vaadin.terminal.StreamVariable;
+import com.vaadin.server.StreamVariable;
 
 /**
  * {@link DragAndDropWrapper} can receive also files from client computer if
diff --git a/server/src/com/vaadin/ui/Image.java b/server/src/com/vaadin/ui/Image.java
index b0dbc9e629..178e557cf3 100644
--- a/server/src/com/vaadin/ui/Image.java
+++ b/server/src/com/vaadin/ui/Image.java
@@ -6,11 +6,11 @@ package com.vaadin.ui;
 
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.image.ImageServerRpc;
 import com.vaadin.shared.ui.image.ImageState;
-import com.vaadin.terminal.Resource;
 
 /**
  * Component for embedding images.
@@ -66,28 +66,46 @@ public class Image extends AbstractEmbedded {
     }
 
     /**
+     * @deprecated As of 7.0.0, use {@link #addClickListener(ClickListener)}
+     *             instead
+     */
+    @Deprecated
+    public void addListener(ClickListener listener) {
+        addClickListener(listener);
+    }
+
+    /**
      * Add a click listener to the component. The listener is called whenever
      * the user clicks inside the component. Depending on the content the event
      * may be blocked and in that case no event is fired.
      * 
-     * Use {@link #removeListener(ClickListener)} to remove the listener.
+     * Use {@link #removeClickListener(ClickListener)} to remove the listener.
      * 
      * @param listener
      *            The listener to add
      */
-    public void addListener(ClickListener listener) {
+    public void addClickListener(ClickListener listener) {
         addListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class, listener,
                 ClickListener.clickMethod);
     }
 
     /**
+     * @deprecated As of 7.0.0, use {@link #removeClickListener(ClickListener)}
+     *             instead
+     */
+    @Deprecated
+    public void removeListener(ClickListener listener) {
+        removeClickListener(listener);
+    }
+
+    /**
      * Remove a click listener from the component. The listener should earlier
-     * have been added using {@link #addListener(ClickListener)}.
+     * have been added using {@link #addClickListener(ClickListener)}.
      * 
      * @param listener
      *            The listener to remove
      */
-    public void removeListener(ClickListener listener) {
+    public void removeClickListener(ClickListener listener) {
         removeListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class,
                 listener);
     }
diff --git a/server/src/com/vaadin/ui/JavaScript.java b/server/src/com/vaadin/ui/JavaScript.java
index e34ccae82a..f3e8564fab 100644
--- a/server/src/com/vaadin/ui/JavaScript.java
+++ b/server/src/com/vaadin/ui/JavaScript.java
@@ -21,11 +21,11 @@ import java.util.Map;
 
 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
+import com.vaadin.server.AbstractExtension;
+import com.vaadin.server.Page;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.shared.extension.javascriptmanager.ExecuteJavaScriptRpc;
 import com.vaadin.shared.extension.javascriptmanager.JavaScriptManagerState;
-import com.vaadin.terminal.AbstractExtension;
-import com.vaadin.terminal.Page;
 
 /**
  * Provides access to JavaScript functionality in the web browser. To get an
diff --git a/server/src/com/vaadin/ui/JavaScriptFunction.java b/server/src/com/vaadin/ui/JavaScriptFunction.java
index 3a17fef995..ebb5e2c073 100644
--- a/server/src/com/vaadin/ui/JavaScriptFunction.java
+++ b/server/src/com/vaadin/ui/JavaScriptFunction.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 
 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
-import com.vaadin.terminal.AbstractJavaScriptExtension;
+import com.vaadin.server.AbstractJavaScriptExtension;
 
 /**
  * Defines a method that is called by a client-side JavaScript function. When
diff --git a/server/src/com/vaadin/ui/Label.java b/server/src/com/vaadin/ui/Label.java
index 81a343e937..ff4a5dcb07 100644
--- a/server/src/com/vaadin/ui/Label.java
+++ b/server/src/com/vaadin/ui/Label.java
@@ -349,11 +349,20 @@ public class Label extends AbstractComponent implements Property<String>,
      * @see com.vaadin.data.Property.ValueChangeNotifier#addListener(com.vaadin.data.Property.ValueChangeListener)
      */
     @Override
-    public void addListener(Property.ValueChangeListener listener) {
+    public void addValueChangeListener(Property.ValueChangeListener listener) {
         addListener(Label.ValueChangeEvent.class, listener, VALUE_CHANGE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Property.ValueChangeListener listener) {
+        addValueChangeListener(listener);
+    }
+
+    /**
      * Removes the value change listener.
      * 
      * @param listener
@@ -361,12 +370,21 @@ public class Label extends AbstractComponent implements Property<String>,
      * @see com.vaadin.data.Property.ValueChangeNotifier#removeListener(com.vaadin.data.Property.ValueChangeListener)
      */
     @Override
-    public void removeListener(Property.ValueChangeListener listener) {
+    public void removeValueChangeListener(Property.ValueChangeListener listener) {
         removeListener(Label.ValueChangeEvent.class, listener,
                 VALUE_CHANGE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Property.ValueChangeListener listener) {
+        removeValueChangeListener(listener);
+    }
+
+    /**
      * Emits the options change event.
      */
     protected void fireValueChange() {
diff --git a/server/src/com/vaadin/ui/Link.java b/server/src/com/vaadin/ui/Link.java
index f98a2b0d2d..a2737e4483 100644
--- a/server/src/com/vaadin/ui/Link.java
+++ b/server/src/com/vaadin/ui/Link.java
@@ -18,11 +18,12 @@ package com.vaadin.ui;
 
 import java.util.Map;
 
+import com.vaadin.server.LegacyComponent;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.BorderStyle;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
+import com.vaadin.shared.ui.link.LinkConstants;
 
 /**
  * Link is used to create external or internal URL links.
@@ -31,7 +32,7 @@ import com.vaadin.terminal.Vaadin6Component;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class Link extends AbstractComponent implements Vaadin6Component {
+public class Link extends AbstractComponent implements LegacyComponent {
 
     /* Target window border type constant: No window border */
     @Deprecated
@@ -45,8 +46,6 @@ public class Link extends AbstractComponent implements Vaadin6Component {
     @Deprecated
     public static final BorderStyle TARGET_BORDER_DEFAULT = BorderStyle.DEFAULT;
 
-    private Resource resource = null;
-
     private String targetName;
 
     private BorderStyle targetBorder = BorderStyle.DEFAULT;
@@ -70,7 +69,7 @@ public class Link extends AbstractComponent implements Vaadin6Component {
      */
     public Link(String caption, Resource resource) {
         setCaption(caption);
-        this.resource = resource;
+        setResource(resource);
     }
 
     /**
@@ -94,7 +93,7 @@ public class Link extends AbstractComponent implements Vaadin6Component {
     public Link(String caption, Resource resource, String targetName,
             int width, int height, BorderStyle border) {
         setCaption(caption);
-        this.resource = resource;
+        setResource(resource);
         setTargetName(targetName);
         setTargetWidth(width);
         setTargetHeight(height);
@@ -111,10 +110,7 @@ public class Link extends AbstractComponent implements Vaadin6Component {
      */
     @Override
     public void paintContent(PaintTarget target) throws PaintException {
-
-        if (resource != null) {
-            target.addAttribute("src", resource);
-        } else {
+        if (getResource() == null) {
             return;
         }
 
@@ -230,7 +226,7 @@ public class Link extends AbstractComponent implements Vaadin6Component {
      * @return the Resource.
      */
     public Resource getResource() {
-        return resource;
+        return getResource(LinkConstants.HREF_RESOURCE);
     }
 
     /**
@@ -240,12 +236,11 @@ public class Link extends AbstractComponent implements Vaadin6Component {
      *            the resource to set.
      */
     public void setResource(Resource resource) {
-        this.resource = resource;
-        markAsDirty();
+        setResource(LinkConstants.HREF_RESOURCE, resource);
     }
 
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
-        // TODO Remove once Vaadin6Component is no longer implemented
+        // TODO Remove once LegacyComponent is no longer implemented
     }
 }
diff --git a/server/src/com/vaadin/ui/ListSelect.java b/server/src/com/vaadin/ui/ListSelect.java
index da78e24fa8..90e1c16a4d 100644
--- a/server/src/com/vaadin/ui/ListSelect.java
+++ b/server/src/com/vaadin/ui/ListSelect.java
@@ -19,8 +19,8 @@ package com.vaadin.ui;
 import java.util.Collection;
 
 import com.vaadin.data.Container;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * This is a simple list select without, for instance, support for new items,
diff --git a/server/src/com/vaadin/ui/LoginForm.java b/server/src/com/vaadin/ui/LoginForm.java
index 1c154699d8..abcc7ff607 100644
--- a/server/src/com/vaadin/ui/LoginForm.java
+++ b/server/src/com/vaadin/ui/LoginForm.java
@@ -25,12 +25,12 @@ import java.util.Iterator;
 import java.util.Map;
 
 import com.vaadin.Application;
+import com.vaadin.server.ConnectorResource;
+import com.vaadin.server.DownloadStream;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.ApplicationResource;
-import com.vaadin.terminal.DownloadStream;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
 
 /**
  * LoginForm is a Vaadin component to handle common problem among Ajax
@@ -58,23 +58,7 @@ public class LoginForm extends CustomComponent {
 
     private Embedded iframe = new Embedded();
 
-    private ApplicationResource loginPage = new ApplicationResource() {
-
-        @Override
-        public Application getApplication() {
-            return LoginForm.this.getApplication();
-        }
-
-        @Override
-        public int getBufferSize() {
-            return getLoginHTML().length;
-        }
-
-        @Override
-        public long getCacheTime() {
-            return -1;
-        }
-
+    private ConnectorResource loginPage = new ConnectorResource() {
         @Override
         public String getFilename() {
             return "login";
@@ -82,8 +66,13 @@ public class LoginForm extends CustomComponent {
 
         @Override
         public DownloadStream getStream() {
-            return new DownloadStream(new ByteArrayInputStream(getLoginHTML()),
-                    getMIMEType(), getFilename());
+            byte[] loginHTML = getLoginHTML();
+            DownloadStream downloadStream = new DownloadStream(
+                    new ByteArrayInputStream(loginHTML), getMIMEType(),
+                    getFilename());
+            downloadStream.setBufferSize(loginHTML.length);
+            downloadStream.setCacheTime(-1);
+            return downloadStream;
         }
 
         @Override
@@ -197,14 +186,12 @@ public class LoginForm extends CustomComponent {
     @Override
     public void attach() {
         super.attach();
-        getApplication().addResource(loginPage);
         getApplication().addRequestHandler(requestHandler);
         iframe.setSource(loginPage);
     }
 
     @Override
     public void detach() {
-        getApplication().removeResource(loginPage);
         getApplication().removeRequestHandler(requestHandler);
 
         super.detach();
@@ -271,19 +258,37 @@ public class LoginForm extends CustomComponent {
      * 
      * @param listener
      */
-    public void addListener(LoginListener listener) {
+    public void addLoginListener(LoginListener listener) {
         addListener(LoginEvent.class, listener, ON_LOGIN_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addLoginListener(LoginListener)}
+     **/
+    @Deprecated
+    public void addListener(LoginListener listener) {
+        addLoginListener(listener);
+    }
+
+    /**
      * Removes LoginListener
      * 
      * @param listener
      */
-    public void removeListener(LoginListener listener) {
+    public void removeLoginListener(LoginListener listener) {
         removeListener(LoginEvent.class, listener, ON_LOGIN_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeLoginListener(LoginListener)}
+     **/
+    @Deprecated
+    public void removeListener(LoginListener listener) {
+        removeLoginListener(listener);
+    }
+
     @Override
     public void setWidth(float width, Unit unit) {
         super.setWidth(width, unit);
diff --git a/server/src/com/vaadin/ui/MenuBar.java b/server/src/com/vaadin/ui/MenuBar.java
index 51c06cf934..d948ef813a 100644
--- a/server/src/com/vaadin/ui/MenuBar.java
+++ b/server/src/com/vaadin/ui/MenuBar.java
@@ -22,11 +22,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.ui.menubar.MenuBarConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * <p>
@@ -36,7 +36,7 @@ import com.vaadin.terminal.Vaadin6Component;
  * </p>
  */
 @SuppressWarnings("serial")
-public class MenuBar extends AbstractComponent implements Vaadin6Component {
+public class MenuBar extends AbstractComponent implements LegacyComponent {
 
     // Items of the top-level menu
     private final List<MenuItem> menuItems;
diff --git a/server/src/com/vaadin/ui/NativeSelect.java b/server/src/com/vaadin/ui/NativeSelect.java
index c2969874b0..8006813276 100644
--- a/server/src/com/vaadin/ui/NativeSelect.java
+++ b/server/src/com/vaadin/ui/NativeSelect.java
@@ -19,8 +19,8 @@ package com.vaadin.ui;
 import java.util.Collection;
 
 import com.vaadin.data.Container;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * This is a simple drop-down select without, for instance, support for
diff --git a/server/src/com/vaadin/ui/Notification.java b/server/src/com/vaadin/ui/Notification.java
index 22ad31dffe..758d2c86a3 100644
--- a/server/src/com/vaadin/ui/Notification.java
+++ b/server/src/com/vaadin/ui/Notification.java
@@ -18,9 +18,9 @@ package com.vaadin.ui;
 
 import java.io.Serializable;
 
+import com.vaadin.server.Page;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.Position;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Resource;
 
 /**
  * A notification message, used to display temporary messages to the user - for
diff --git a/server/src/com/vaadin/ui/OptionGroup.java b/server/src/com/vaadin/ui/OptionGroup.java
index 12507442c9..983a01381d 100644
--- a/server/src/com/vaadin/ui/OptionGroup.java
+++ b/server/src/com/vaadin/ui/OptionGroup.java
@@ -27,9 +27,9 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.optiongroup.OptionGroupConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
 
 /**
  * Configures select to be used as an option group.
@@ -89,28 +89,63 @@ public class OptionGroup extends AbstractSelect implements
     }
 
     @Override
-    public void addListener(BlurListener listener) {
+    public void addBlurListener(BlurListener listener) {
         addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void addListener(BlurListener listener) {
+        addBlurListener(listener);
+    }
+
     @Override
-    public void removeListener(BlurListener listener) {
+    public void removeBlurListener(BlurListener listener) {
         removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void removeListener(BlurListener listener) {
+        removeBlurListener(listener);
+    }
+
     @Override
-    public void addListener(FocusListener listener) {
+    public void addFocusListener(FocusListener listener) {
         addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void addListener(FocusListener listener) {
+        addFocusListener(listener);
+    }
+
     @Override
-    public void removeListener(FocusListener listener) {
+    public void removeFocusListener(FocusListener listener) {
         removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
 
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void removeListener(FocusListener listener) {
+        removeFocusListener(listener);
+    }
+
     @Override
     protected void setValue(Object newValue, boolean repaintIsNotNeeded) {
         if (repaintIsNotNeeded) {
diff --git a/server/src/com/vaadin/ui/Panel.java b/server/src/com/vaadin/ui/Panel.java
index 00810b83db..6f399bcc19 100644
--- a/server/src/com/vaadin/ui/Panel.java
+++ b/server/src/com/vaadin/ui/Panel.java
@@ -25,14 +25,14 @@ import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ActionManager;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Scrollable;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.panel.PanelServerRpc;
 import com.vaadin.shared.ui.panel.PanelState;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Scrollable;
-import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.ui.Component.Focusable;
 
 /**
@@ -45,7 +45,7 @@ import com.vaadin.ui.Component.Focusable;
 public class Panel extends AbstractComponentContainer implements Scrollable,
         ComponentContainer.ComponentAttachListener,
         ComponentContainer.ComponentDetachListener, Action.Notifier, Focusable,
-        Vaadin6Component {
+        LegacyComponent {
 
     /**
      * Content of the panel.
@@ -195,8 +195,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.Vaadin6Component#paintContent(com.vaadin.terminal
+     * @see com.vaadin.server.LegacyComponent#paintContent(com.vaadin.server
      * .PaintTarget)
      */
     @Override
@@ -250,7 +249,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * Called when one or more variables handled by the implementing class are
      * changed.
      * 
-     * @see com.vaadin.terminal.VariableOwner#changeVariables(Object, Map)
+     * @see com.vaadin.server.VariableOwner#changeVariables(Object, Map)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -289,7 +288,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Scrollable#setScrollable(boolean)
+     * @see com.vaadin.server.Scrollable#setScrollable(boolean)
      */
     @Override
     public int getScrollLeft() {
@@ -299,7 +298,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Scrollable#setScrollable(boolean)
+     * @see com.vaadin.server.Scrollable#setScrollable(boolean)
      */
     @Override
     public int getScrollTop() {
@@ -309,7 +308,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Scrollable#setScrollLeft(int)
+     * @see com.vaadin.server.Scrollable#setScrollLeft(int)
      */
     @Override
     public void setScrollLeft(int scrollLeft) {
@@ -323,7 +322,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Scrollable#setScrollTop(int)
+     * @see com.vaadin.server.Scrollable#setScrollTop(int)
      */
     @Override
     public void setScrollTop(int scrollTop) {
@@ -432,24 +431,42 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * @param listener
      *            The listener to add
      */
-    public void addListener(ClickListener listener) {
+    public void addClickListener(ClickListener listener) {
         addListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class, listener,
                 ClickListener.clickMethod);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addClickListener(ClickListener)}
+     **/
+    @Deprecated
+    public void addListener(ClickListener listener) {
+        addClickListener(listener);
+    }
+
+    /**
      * Remove a click listener from the Panel. The listener should earlier have
      * been added using {@link #addListener(ClickListener)}.
      * 
      * @param listener
      *            The listener to remove
      */
-    public void removeListener(ClickListener listener) {
+    public void removeClickListener(ClickListener listener) {
         removeListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class,
                 listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeClickListener(ClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(ClickListener listener) {
+        addClickListener(listener);
+    }
+
+    /**
      * {@inheritDoc}
      */
     @Override
diff --git a/server/src/com/vaadin/ui/PopupDateField.java b/server/src/com/vaadin/ui/PopupDateField.java
index acff49a142..39e0578301 100644
--- a/server/src/com/vaadin/ui/PopupDateField.java
+++ b/server/src/com/vaadin/ui/PopupDateField.java
@@ -19,8 +19,8 @@ package com.vaadin.ui;
 import java.util.Date;
 
 import com.vaadin.data.Property;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * <p>
diff --git a/server/src/com/vaadin/ui/PopupView.java b/server/src/com/vaadin/ui/PopupView.java
index 786257c240..8d6d28e121 100644
--- a/server/src/com/vaadin/ui/PopupView.java
+++ b/server/src/com/vaadin/ui/PopupView.java
@@ -20,10 +20,10 @@ import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.vaadin.terminal.LegacyPaint;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
+import com.vaadin.server.LegacyPaint;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.LegacyComponent;
 
 /**
  * 
@@ -36,7 +36,7 @@ import com.vaadin.terminal.Vaadin6Component;
  */
 @SuppressWarnings("serial")
 public class PopupView extends AbstractComponentContainer implements
-        Vaadin6Component {
+        LegacyComponent {
 
     private Content content;
     private boolean hideOnMouseOut;
@@ -309,7 +309,7 @@ public class PopupView extends AbstractComponentContainer implements
     /**
      * Paint (serialize) the component for the client.
      * 
-     * @see com.vaadin.ui.AbstractComponent#paintContent(com.vaadin.terminal.PaintTarget)
+     * @see com.vaadin.ui.AbstractComponent#paintContent(com.vaadin.server.PaintTarget)
      */
     @Override
     public void paintContent(PaintTarget target) throws PaintException {
@@ -377,12 +377,21 @@ public class PopupView extends AbstractComponentContainer implements
      * @see #removeListener(PopupVisibilityListener)
      * 
      */
-    public void addListener(PopupVisibilityListener listener) {
+    public void addPopupVisibilityListener(PopupVisibilityListener listener) {
         addListener(PopupVisibilityEvent.class, listener,
                 POPUP_VISIBILITY_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPopupVisibilityListener(PopupVisibilityListener)}
+     **/
+    @Deprecated
+    public void addListener(PopupVisibilityListener listener) {
+        addPopupVisibilityListener(listener);
+    }
+
+    /**
      * Removes a previously added listener, so that it no longer receives events
      * when the visibility of the popup changes.
      * 
@@ -391,12 +400,21 @@ public class PopupView extends AbstractComponentContainer implements
      * @see PopupVisibilityListener
      * @see #addListener(PopupVisibilityListener)
      */
-    public void removeListener(PopupVisibilityListener listener) {
+    public void removePopupVisibilityListener(PopupVisibilityListener listener) {
         removeListener(PopupVisibilityEvent.class, listener,
                 POPUP_VISIBILITY_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePopupVisibilityListener(PopupVisibilityListener)}
+     **/
+    @Deprecated
+    public void removeListener(PopupVisibilityListener listener) {
+        removePopupVisibilityListener(listener);
+    }
+
+    /**
      * This event is received by the PopupVisibilityListeners when the
      * visibility of the popup changes. You can get the new visibility directly
      * with {@link #isPopupVisible()}, or get the PopupView that produced the
diff --git a/server/src/com/vaadin/ui/ProgressIndicator.java b/server/src/com/vaadin/ui/ProgressIndicator.java
index 528c404ab9..7558ff0e43 100644
--- a/server/src/com/vaadin/ui/ProgressIndicator.java
+++ b/server/src/com/vaadin/ui/ProgressIndicator.java
@@ -20,9 +20,9 @@ import java.util.Map;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.LegacyComponent;
 
 /**
  * <code>ProgressIndicator</code> is component that shows user state of a
@@ -38,7 +38,7 @@ import com.vaadin.terminal.Vaadin6Component;
  */
 @SuppressWarnings("serial")
 public class ProgressIndicator extends AbstractField<Number> implements
-        Property.Viewer, Property.ValueChangeListener, Vaadin6Component {
+        Property.Viewer, Property.ValueChangeListener, LegacyComponent {
 
     /**
      * Content mode, where the label contains only plain text. The getValue()
@@ -260,7 +260,7 @@ public class ProgressIndicator extends AbstractField<Number> implements
 
     @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
-        // TODO Remove once Vaadin6Component is no longer implemented
+        // TODO Remove once LegacyComponent is no longer implemented
 
     }
 
diff --git a/server/src/com/vaadin/ui/RichTextArea.java b/server/src/com/vaadin/ui/RichTextArea.java
index 51caa82136..261701b835 100644
--- a/server/src/com/vaadin/ui/RichTextArea.java
+++ b/server/src/com/vaadin/ui/RichTextArea.java
@@ -19,9 +19,9 @@ package com.vaadin.ui;
 import java.util.Map;
 
 import com.vaadin.data.Property;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.LegacyComponent;
 
 /**
  * A simple RichTextArea to edit HTML format text.
@@ -31,7 +31,7 @@ import com.vaadin.terminal.Vaadin6Component;
  * into length of field.
  */
 public class RichTextArea extends AbstractField<String> implements
-        Vaadin6Component {
+        LegacyComponent {
 
     /**
      * Null representation.
diff --git a/server/src/com/vaadin/ui/Select.java b/server/src/com/vaadin/ui/Select.java
index 6ff7c9c9bc..ef8ba6d307 100644
--- a/server/src/com/vaadin/ui/Select.java
+++ b/server/src/com/vaadin/ui/Select.java
@@ -16,25 +16,9 @@
 
 package com.vaadin.ui;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import com.vaadin.data.Container;
-import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.event.FieldEvents;
-import com.vaadin.event.FieldEvents.BlurEvent;
-import com.vaadin.event.FieldEvents.BlurListener;
-import com.vaadin.event.FieldEvents.FocusEvent;
-import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
 
 /**
  * <p>
@@ -51,59 +35,10 @@ import com.vaadin.terminal.Resource;
  * 
  * @author Vaadin Ltd.
  * @since 3.0
+ * @deprecated as of 7.0. Use {@link ComboBox} instead.
  */
-@SuppressWarnings("serial")
-public class Select extends AbstractSelect implements AbstractSelect.Filtering,
-        FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
-
-    /**
-     * Holds value of property pageLength. 0 disables paging.
-     */
-    protected int pageLength = 10;
-
-    private int columns = 0;
-
-    // Current page when the user is 'paging' trough options
-    private int currentPage = -1;
-
-    private int filteringMode = FILTERINGMODE_STARTSWITH;
-
-    private String filterstring;
-    private String prevfilterstring;
-
-    /**
-     * Number of options that pass the filter, excluding the null item if any.
-     */
-    private int filteredSize;
-
-    /**
-     * Cache of filtered options, used only by the in-memory filtering system.
-     */
-    private List<Object> filteredOptions;
-
-    /**
-     * Flag to indicate that request repaint is called by filter request only
-     */
-    private boolean optionRequest;
-
-    /**
-     * True if the container is being filtered temporarily and item set change
-     * notifications should be suppressed.
-     */
-    private boolean filteringContainer;
-
-    /**
-     * Flag to indicate whether to scroll the selected item visible (select the
-     * page on which it is) when opening the popup or not. Only applies to
-     * single select mode.
-     * 
-     * This requires finding the index of the item, which can be expensive in
-     * many large lazy loading containers.
-     */
-    private boolean scrollToSelectedItem = true;
-
-    /* Constructors */
-
+@Deprecated
+public class Select extends ComboBox {
     /* Component methods */
 
     public Select() {
@@ -122,652 +57,4 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
         super(caption);
     }
 
-    /**
-     * Paints the content of this component.
-     * 
-     * @param target
-     *            the Paint Event.
-     * @throws PaintException
-     *             if the paint operation failed.
-     */
-    @Override
-    public void paintContent(PaintTarget target) throws PaintException {
-        if (isMultiSelect()) {
-            // background compatibility hack. This object shouldn't be used for
-            // multiselect lists anymore (ListSelect instead). This fallbacks to
-            // a simpler paint method in super class.
-            super.paintContent(target);
-            // Fix for #4553
-            target.addAttribute("type", "legacy-multi");
-            return;
-        }
-
-        // clear caption change listeners
-        getCaptionChangeListener().clear();
-
-        // The tab ordering number
-        if (getTabIndex() != 0) {
-            target.addAttribute("tabindex", getTabIndex());
-        }
-
-        // If the field is modified, but not committed, set modified attribute
-        if (isModified()) {
-            target.addAttribute("modified", true);
-        }
-
-        if (isNewItemsAllowed()) {
-            target.addAttribute("allownewitem", true);
-        }
-
-        boolean needNullSelectOption = false;
-        if (isNullSelectionAllowed()) {
-            target.addAttribute("nullselect", true);
-            needNullSelectOption = (getNullSelectionItemId() == null);
-            if (!needNullSelectOption) {
-                target.addAttribute("nullselectitem", true);
-            }
-        }
-
-        // Constructs selected keys array
-        String[] selectedKeys;
-        if (isMultiSelect()) {
-            selectedKeys = new String[((Set<?>) getValue()).size()];
-        } else {
-            selectedKeys = new String[(getValue() == null
-                    && getNullSelectionItemId() == null ? 0 : 1)];
-        }
-
-        target.addAttribute("pagelength", pageLength);
-
-        target.addAttribute("filteringmode", getFilteringMode());
-
-        // Paints the options and create array of selected id keys
-        int keyIndex = 0;
-
-        target.startTag("options");
-
-        if (currentPage < 0) {
-            optionRequest = false;
-            currentPage = 0;
-            filterstring = "";
-        }
-
-        boolean nullFilteredOut = filterstring != null
-                && !"".equals(filterstring)
-                && filteringMode != FILTERINGMODE_OFF;
-        // null option is needed and not filtered out, even if not on current
-        // page
-        boolean nullOptionVisible = needNullSelectOption && !nullFilteredOut;
-
-        // first try if using container filters is possible
-        List<?> options = getOptionsWithFilter(nullOptionVisible);
-        if (null == options) {
-            // not able to use container filters, perform explicit in-memory
-            // filtering
-            options = getFilteredOptions();
-            filteredSize = options.size();
-            options = sanitetizeList(options, nullOptionVisible);
-        }
-
-        final boolean paintNullSelection = needNullSelectOption
-                && currentPage == 0 && !nullFilteredOut;
-
-        if (paintNullSelection) {
-            target.startTag("so");
-            target.addAttribute("caption", "");
-            target.addAttribute("key", "");
-            target.endTag("so");
-        }
-
-        final Iterator<?> i = options.iterator();
-        // Paints the available selection options from data source
-
-        while (i.hasNext()) {
-
-            final Object id = i.next();
-
-            if (!isNullSelectionAllowed() && id != null
-                    && id.equals(getNullSelectionItemId()) && !isSelected(id)) {
-                continue;
-            }
-
-            // Gets the option attribute values
-            final String key = itemIdMapper.key(id);
-            final String caption = getItemCaption(id);
-            final Resource icon = getItemIcon(id);
-            getCaptionChangeListener().addNotifierForItem(id);
-
-            // Paints the option
-            target.startTag("so");
-            if (icon != null) {
-                target.addAttribute("icon", icon);
-            }
-            target.addAttribute("caption", caption);
-            if (id != null && id.equals(getNullSelectionItemId())) {
-                target.addAttribute("nullselection", true);
-            }
-            target.addAttribute("key", key);
-            if (isSelected(id) && keyIndex < selectedKeys.length) {
-                target.addAttribute("selected", true);
-                selectedKeys[keyIndex++] = key;
-            }
-            target.endTag("so");
-        }
-        target.endTag("options");
-
-        target.addAttribute("totalitems", size()
-                + (needNullSelectOption ? 1 : 0));
-        if (filteredSize > 0 || nullOptionVisible) {
-            target.addAttribute("totalMatches", filteredSize
-                    + (nullOptionVisible ? 1 : 0));
-        }
-
-        // Paint variables
-        target.addVariable(this, "selected", selectedKeys);
-        if (isNewItemsAllowed()) {
-            target.addVariable(this, "newitem", "");
-        }
-
-        target.addVariable(this, "filter", filterstring);
-        target.addVariable(this, "page", currentPage);
-
-        currentPage = -1; // current page is always set by client
-
-        optionRequest = true;
-    }
-
-    /**
-     * Returns the filtered options for the current page using a container
-     * filter.
-     * 
-     * As a size effect, {@link #filteredSize} is set to the total number of
-     * items passing the filter.
-     * 
-     * The current container must be {@link Filterable} and {@link Indexed}, and
-     * the filtering mode must be suitable for container filtering (tested with
-     * {@link #canUseContainerFilter()}).
-     * 
-     * Use {@link #getFilteredOptions()} and
-     * {@link #sanitetizeList(List, boolean)} if this is not the case.
-     * 
-     * @param needNullSelectOption
-     * @return filtered list of options (may be empty) or null if cannot use
-     *         container filters
-     */
-    protected List<?> getOptionsWithFilter(boolean needNullSelectOption) {
-        Container container = getContainerDataSource();
-
-        if (pageLength == 0) {
-            // no paging: return all items
-            filteredSize = container.size();
-            return new ArrayList<Object>(container.getItemIds());
-        }
-
-        if (!(container instanceof Filterable)
-                || !(container instanceof Indexed)
-                || getItemCaptionMode() != ITEM_CAPTION_MODE_PROPERTY) {
-            return null;
-        }
-
-        Filterable filterable = (Filterable) container;
-
-        Filter filter = buildFilter(filterstring, filteringMode);
-
-        // adding and removing filters leads to extraneous item set
-        // change events from the underlying container, but the ComboBox does
-        // not process or propagate them based on the flag filteringContainer
-        if (filter != null) {
-            filteringContainer = true;
-            filterable.addContainerFilter(filter);
-        }
-
-        Indexed indexed = (Indexed) container;
-
-        int indexToEnsureInView = -1;
-
-        // if not an option request (item list when user changes page), go
-        // to page with the selected item after filtering if accepted by
-        // filter
-        Object selection = getValue();
-        if (isScrollToSelectedItem() && !optionRequest && !isMultiSelect()
-                && selection != null) {
-            // ensure proper page
-            indexToEnsureInView = indexed.indexOfId(selection);
-        }
-
-        filteredSize = container.size();
-        currentPage = adjustCurrentPage(currentPage, needNullSelectOption,
-                indexToEnsureInView, filteredSize);
-        int first = getFirstItemIndexOnCurrentPage(needNullSelectOption,
-                filteredSize);
-        int last = getLastItemIndexOnCurrentPage(needNullSelectOption,
-                filteredSize, first);
-
-        List<Object> options = new ArrayList<Object>();
-        for (int i = first; i <= last && i < filteredSize; ++i) {
-            options.add(indexed.getIdByIndex(i));
-        }
-
-        // to the outside, filtering should not be visible
-        if (filter != null) {
-            filterable.removeContainerFilter(filter);
-            filteringContainer = false;
-        }
-
-        return options;
-    }
-
-    /**
-     * Constructs a filter instance to use when using a Filterable container in
-     * the <code>ITEM_CAPTION_MODE_PROPERTY</code> mode.
-     * 
-     * Note that the client side implementation expects the filter string to
-     * apply to the item caption string it sees, so changing the behavior of
-     * this method can cause problems.
-     * 
-     * @param filterString
-     * @param filteringMode
-     * @return
-     */
-    protected Filter buildFilter(String filterString, int filteringMode) {
-        Filter filter = null;
-
-        if (null != filterString && !"".equals(filterString)) {
-            switch (filteringMode) {
-            case FILTERINGMODE_OFF:
-                break;
-            case FILTERINGMODE_STARTSWITH:
-                filter = new SimpleStringFilter(getItemCaptionPropertyId(),
-                        filterString, true, true);
-                break;
-            case FILTERINGMODE_CONTAINS:
-                filter = new SimpleStringFilter(getItemCaptionPropertyId(),
-                        filterString, true, false);
-                break;
-            }
-        }
-        return filter;
-    }
-
-    @Override
-    public void containerItemSetChange(Container.ItemSetChangeEvent event) {
-        if (!filteringContainer) {
-            super.containerItemSetChange(event);
-        }
-    }
-
-    /**
-     * Makes correct sublist of given list of options.
-     * 
-     * If paint is not an option request (affected by page or filter change),
-     * page will be the one where possible selection exists.
-     * 
-     * Detects proper first and last item in list to return right page of
-     * options. Also, if the current page is beyond the end of the list, it will
-     * be adjusted.
-     * 
-     * @param options
-     * @param needNullSelectOption
-     *            flag to indicate if nullselect option needs to be taken into
-     *            consideration
-     */
-    private List<?> sanitetizeList(List<?> options, boolean needNullSelectOption) {
-
-        if (pageLength != 0 && options.size() > pageLength) {
-
-            int indexToEnsureInView = -1;
-
-            // if not an option request (item list when user changes page), go
-            // to page with the selected item after filtering if accepted by
-            // filter
-            Object selection = getValue();
-            if (isScrollToSelectedItem() && !optionRequest && !isMultiSelect()
-                    && selection != null) {
-                // ensure proper page
-                indexToEnsureInView = options.indexOf(selection);
-            }
-
-            int size = options.size();
-            currentPage = adjustCurrentPage(currentPage, needNullSelectOption,
-                    indexToEnsureInView, size);
-            int first = getFirstItemIndexOnCurrentPage(needNullSelectOption,
-                    size);
-            int last = getLastItemIndexOnCurrentPage(needNullSelectOption,
-                    size, first);
-            return options.subList(first, last + 1);
-        } else {
-            return options;
-        }
-    }
-
-    /**
-     * Returns the index of the first item on the current page. The index is to
-     * the underlying (possibly filtered) contents. The null item, if any, does
-     * not have an index but takes up a slot on the first page.
-     * 
-     * @param needNullSelectOption
-     *            true if a null option should be shown before any other options
-     *            (takes up the first slot on the first page, not counted in
-     *            index)
-     * @param size
-     *            number of items after filtering (not including the null item,
-     *            if any)
-     * @return first item to show on the UI (index to the filtered list of
-     *         options, not taking the null item into consideration if any)
-     */
-    private int getFirstItemIndexOnCurrentPage(boolean needNullSelectOption,
-            int size) {
-        // Not all options are visible, find out which ones are on the
-        // current "page".
-        int first = currentPage * pageLength;
-        if (needNullSelectOption && currentPage > 0) {
-            first--;
-        }
-        return first;
-    }
-
-    /**
-     * Returns the index of the last item on the current page. The index is to
-     * the underlying (possibly filtered) contents. If needNullSelectOption is
-     * true, the null item takes up the first slot on the first page,
-     * effectively reducing the first page size by one.
-     * 
-     * @param needNullSelectOption
-     *            true if a null option should be shown before any other options
-     *            (takes up the first slot on the first page, not counted in
-     *            index)
-     * @param size
-     *            number of items after filtering (not including the null item,
-     *            if any)
-     * @param first
-     *            index in the filtered view of the first item of the page
-     * @return index in the filtered view of the last item on the page
-     */
-    private int getLastItemIndexOnCurrentPage(boolean needNullSelectOption,
-            int size, int first) {
-        // page length usable for non-null items
-        int effectivePageLength = pageLength
-                - (needNullSelectOption && (currentPage == 0) ? 1 : 0);
-        return Math.min(size - 1, first + effectivePageLength - 1);
-    }
-
-    /**
-     * Adjusts the index of the current page if necessary: make sure the current
-     * page is not after the end of the contents, and optionally go to the page
-     * containg a specific item. There are no side effects but the adjusted page
-     * index is returned.
-     * 
-     * @param page
-     *            page number to use as the starting point
-     * @param needNullSelectOption
-     *            true if a null option should be shown before any other options
-     *            (takes up the first slot on the first page, not counted in
-     *            index)
-     * @param indexToEnsureInView
-     *            index of an item that should be included on the page (in the
-     *            data set, not counting the null item if any), -1 for none
-     * @param size
-     *            number of items after filtering (not including the null item,
-     *            if any)
-     */
-    private int adjustCurrentPage(int page, boolean needNullSelectOption,
-            int indexToEnsureInView, int size) {
-        if (indexToEnsureInView != -1) {
-            int newPage = (indexToEnsureInView + (needNullSelectOption ? 1 : 0))
-                    / pageLength;
-            page = newPage;
-        }
-        // adjust the current page if beyond the end of the list
-        if (page * pageLength > size) {
-            page = (size + (needNullSelectOption ? 1 : 0)) / pageLength;
-        }
-        return page;
-    }
-
-    /**
-     * Filters the options in memory and returns the full filtered list.
-     * 
-     * This can be less efficient than using container filters, so use
-     * {@link #getOptionsWithFilter(boolean)} if possible (filterable container
-     * and suitable item caption mode etc.).
-     * 
-     * @return
-     */
-    protected List<?> getFilteredOptions() {
-        if (null == filterstring || "".equals(filterstring)
-                || FILTERINGMODE_OFF == filteringMode) {
-            prevfilterstring = null;
-            filteredOptions = new LinkedList<Object>(getItemIds());
-            return filteredOptions;
-        }
-
-        if (filterstring.equals(prevfilterstring)) {
-            return filteredOptions;
-        }
-
-        Collection<?> items;
-        if (prevfilterstring != null
-                && filterstring.startsWith(prevfilterstring)) {
-            items = filteredOptions;
-        } else {
-            items = getItemIds();
-        }
-        prevfilterstring = filterstring;
-
-        filteredOptions = new LinkedList<Object>();
-        for (final Iterator<?> it = items.iterator(); it.hasNext();) {
-            final Object itemId = it.next();
-            String caption = getItemCaption(itemId);
-            if (caption == null || caption.equals("")) {
-                continue;
-            } else {
-                caption = caption.toLowerCase();
-            }
-            switch (filteringMode) {
-            case FILTERINGMODE_CONTAINS:
-                if (caption.indexOf(filterstring) > -1) {
-                    filteredOptions.add(itemId);
-                }
-                break;
-            case FILTERINGMODE_STARTSWITH:
-            default:
-                if (caption.startsWith(filterstring)) {
-                    filteredOptions.add(itemId);
-                }
-                break;
-            }
-        }
-
-        return filteredOptions;
-    }
-
-    /**
-     * Invoked when the value of a variable has changed.
-     * 
-     * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object,
-     *      java.util.Map)
-     */
-    @Override
-    public void changeVariables(Object source, Map<String, Object> variables) {
-        // Not calling super.changeVariables due the history of select
-        // component hierarchy
-
-        // Selection change
-        if (variables.containsKey("selected")) {
-            final String[] ka = (String[]) variables.get("selected");
-
-            if (isMultiSelect()) {
-                // Multiselect mode
-
-                // TODO Optimize by adding repaintNotNeeded whan applicaple
-
-                // Converts the key-array to id-set
-                final LinkedList<Object> s = new LinkedList<Object>();
-                for (int i = 0; i < ka.length; i++) {
-                    final Object id = itemIdMapper.get(ka[i]);
-                    if (id != null && containsId(id)) {
-                        s.add(id);
-                    }
-                }
-
-                // Limits the deselection to the set of visible items
-                // (non-visible items can not be deselected)
-                final Collection<?> visible = getVisibleItemIds();
-                if (visible != null) {
-                    @SuppressWarnings("unchecked")
-                    Set<Object> newsel = (Set<Object>) getValue();
-                    if (newsel == null) {
-                        newsel = new HashSet<Object>();
-                    } else {
-                        newsel = new HashSet<Object>(newsel);
-                    }
-                    newsel.removeAll(visible);
-                    newsel.addAll(s);
-                    setValue(newsel, true);
-                }
-            } else {
-                // Single select mode
-                if (ka.length == 0) {
-
-                    // Allows deselection only if the deselected item is visible
-                    final Object current = getValue();
-                    final Collection<?> visible = getVisibleItemIds();
-                    if (visible != null && visible.contains(current)) {
-                        setValue(null, true);
-                    }
-                } else {
-                    final Object id = itemIdMapper.get(ka[0]);
-                    if (id != null && id.equals(getNullSelectionItemId())) {
-                        setValue(null, true);
-                    } else {
-                        setValue(id, true);
-                    }
-                }
-            }
-        }
-
-        String newFilter;
-        if ((newFilter = (String) variables.get("filter")) != null) {
-            // this is a filter request
-            currentPage = ((Integer) variables.get("page")).intValue();
-            filterstring = newFilter;
-            if (filterstring != null) {
-                filterstring = filterstring.toLowerCase();
-            }
-            requestRepaint();
-        } else if (isNewItemsAllowed()) {
-            // New option entered (and it is allowed)
-            final String newitem = (String) variables.get("newitem");
-            if (newitem != null && newitem.length() > 0) {
-                getNewItemHandler().addNewItem(newitem);
-                // rebuild list
-                filterstring = null;
-                prevfilterstring = null;
-            }
-        }
-
-        if (variables.containsKey(FocusEvent.EVENT_ID)) {
-            fireEvent(new FocusEvent(this));
-        }
-        if (variables.containsKey(BlurEvent.EVENT_ID)) {
-            fireEvent(new BlurEvent(this));
-        }
-
-    }
-
-    @Override
-    @Deprecated
-    public void requestRepaint() {
-        markAsDirty();
-    }
-
-    @Override
-    public void setFilteringMode(int filteringMode) {
-        this.filteringMode = filteringMode;
-    }
-
-    @Override
-    public int getFilteringMode() {
-        return filteringMode;
-    }
-
-    @Override
-    public void addListener(BlurListener listener) {
-        addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
-                BlurListener.blurMethod);
-    }
-
-    @Override
-    public void removeListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
-    @Override
-    public void addListener(FocusListener listener) {
-        addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
-                FocusListener.focusMethod);
-    }
-
-    @Override
-    public void removeListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-
-    }
-
-    /**
-     * @deprecated use {@link ListSelect}, {@link OptionGroup} or
-     *             {@link TwinColSelect} instead
-     * @see com.vaadin.ui.AbstractSelect#setMultiSelect(boolean)
-     * @throws UnsupportedOperationException
-     *             if trying to activate multiselect mode
-     */
-    @Deprecated
-    @Override
-    public void setMultiSelect(boolean multiSelect) {
-        if (multiSelect) {
-            throw new UnsupportedOperationException("Multiselect not supported");
-        }
-    }
-
-    /**
-     * @deprecated use {@link ListSelect}, {@link OptionGroup} or
-     *             {@link TwinColSelect} instead
-     * 
-     * @see com.vaadin.ui.AbstractSelect#isMultiSelect()
-     */
-    @Deprecated
-    @Override
-    public boolean isMultiSelect() {
-        return super.isMultiSelect();
-    }
-
-    /**
-     * Sets whether to scroll the selected item visible (directly open the page
-     * on which it is) when opening the combo box popup or not. Only applies to
-     * single select mode.
-     * 
-     * This requires finding the index of the item, which can be expensive in
-     * many large lazy loading containers.
-     * 
-     * @param scrollToSelectedItem
-     *            true to find the page with the selected item when opening the
-     *            selection popup
-     */
-    public void setScrollToSelectedItem(boolean scrollToSelectedItem) {
-        this.scrollToSelectedItem = scrollToSelectedItem;
-    }
-
-    /**
-     * Returns true if the select should find the page with the selected item
-     * when opening the popup (single select combo box only).
-     * 
-     * @see #setScrollToSelectedItem(boolean)
-     * 
-     * @return true if the page with the selected item will be shown when
-     *         opening the popup
-     */
-    public boolean isScrollToSelectedItem() {
-        return scrollToSelectedItem;
-    }
-
 }
diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java
index 82faedcc41..eb66de519f 100644
--- a/server/src/com/vaadin/ui/TabSheet.java
+++ b/server/src/com/vaadin/ui/TabSheet.java
@@ -30,15 +30,15 @@ import com.vaadin.event.FieldEvents.BlurNotifier;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.event.FieldEvents.FocusNotifier;
+import com.vaadin.server.ErrorMessage;
+import com.vaadin.server.KeyMapper;
+import com.vaadin.server.LegacyPaint;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants;
 import com.vaadin.shared.ui.tabsheet.TabsheetConstants;
-import com.vaadin.terminal.ErrorMessage;
-import com.vaadin.terminal.KeyMapper;
-import com.vaadin.terminal.LegacyPaint;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.ui.Component.Focusable;
 import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.ui.themes.Runo;
@@ -71,7 +71,7 @@ import com.vaadin.ui.themes.Runo;
  * @since 3.0
  */
 public class TabSheet extends AbstractComponentContainer implements Focusable,
-        FocusNotifier, BlurNotifier, Vaadin6Component {
+        FocusNotifier, BlurNotifier, LegacyComponent {
 
     /**
      * List of component tabs (tab contents). In addition to being on this list,
@@ -791,23 +791,42 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
      * @param listener
      *            the Listener to be added.
      */
-    public void addListener(SelectedTabChangeListener listener) {
+    public void addSelectedTabChangeListener(SelectedTabChangeListener listener) {
         addListener(SelectedTabChangeEvent.class, listener,
                 SELECTED_TAB_CHANGE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addSelectedTabChangeListener(SelectedTabChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(SelectedTabChangeListener listener) {
+        addSelectedTabChangeListener(listener);
+    }
+
+    /**
      * Removes a tab selection listener
      * 
      * @param listener
      *            the Listener to be removed.
      */
-    public void removeListener(SelectedTabChangeListener listener) {
+    public void removeSelectedTabChangeListener(
+            SelectedTabChangeListener listener) {
         removeListener(SelectedTabChangeEvent.class, listener,
                 SELECTED_TAB_CHANGE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeSelectedTabChangeListener(SelectedTabChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(SelectedTabChangeListener listener) {
+        removeSelectedTabChangeListener(listener);
+    }
+
+    /**
      * Sends an event that the currently selected tab has changed.
      */
     protected void fireSelectedTabChange() {
@@ -1211,26 +1230,60 @@ public class TabSheet extends AbstractComponentContainer implements Focusable,
     }
 
     @Override
-    public void addListener(BlurListener listener) {
+    public void addBlurListener(BlurListener listener) {
         addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void addListener(BlurListener listener) {
+        addBlurListener(listener);
+    }
+
     @Override
-    public void removeListener(BlurListener listener) {
+    public void removeBlurListener(BlurListener listener) {
         removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void removeListener(BlurListener listener) {
+        removeBlurListener(listener);
+    }
+
     @Override
-    public void addListener(FocusListener listener) {
+    public void addFocusListener(FocusListener listener) {
         addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void addListener(FocusListener listener) {
+        addFocusListener(listener);
+    }
+
     @Override
-    public void removeListener(FocusListener listener) {
+    public void removeFocusListener(FocusListener listener) {
         removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
+    }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void removeListener(FocusListener listener) {
+        removeFocusListener(listener);
     }
 
     @Override
diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index 8fc3fc2572..d1bdcdd708 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -52,13 +52,13 @@ import com.vaadin.event.dd.DragSource;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.DropTarget;
 import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion;
+import com.vaadin.server.KeyMapper;
+import com.vaadin.server.LegacyPaint;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.table.TableConstants;
-import com.vaadin.terminal.KeyMapper;
-import com.vaadin.terminal.LegacyPaint;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
 
 /**
  * <p>
@@ -4575,17 +4575,35 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     @Override
-    public void addListener(ItemClickListener listener) {
+    public void addItemClickListener(ItemClickListener listener) {
         addListener(TableConstants.ITEM_CLICK_EVENT_ID, ItemClickEvent.class,
                 listener, ItemClickEvent.ITEM_CLICK_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemClickListener(ItemClickListener)}
+     **/
+    @Deprecated
+    public void addListener(ItemClickListener listener) {
+        addItemClickListener(listener);
+    }
+
     @Override
-    public void removeListener(ItemClickListener listener) {
+    public void removeItemClickListener(ItemClickListener listener) {
         removeListener(TableConstants.ITEM_CLICK_EVENT_ID,
                 ItemClickEvent.class, listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeItemClickListener(ItemClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(ItemClickListener listener) {
+        removeItemClickListener(listener);
+    }
+
     // Identical to AbstractCompoenentContainer.setEnabled();
 
     @Override
@@ -4759,7 +4777,7 @@ public class Table extends AbstractSelect implements Action.Container,
          * 
          * @see
          * com.vaadin.event.dd.acceptcriteria.AcceptCriterion#paintResponse(
-         * com.vaadin.terminal.PaintTarget)
+         * com.vaadin.server.PaintTarget)
          */
 
         @Override
@@ -4926,24 +4944,42 @@ public class Table extends AbstractSelect implements Action.Container,
      * @param listener
      *            The handler which should handle the header click events.
      */
-    public void addListener(HeaderClickListener listener) {
+    public void addHeaderClickListener(HeaderClickListener listener) {
         addListener(TableConstants.HEADER_CLICK_EVENT_ID,
                 HeaderClickEvent.class, listener,
                 HeaderClickEvent.HEADER_CLICK_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addHeaderClickListener(HeaderClickListener)}
+     **/
+    @Deprecated
+    public void addListener(HeaderClickListener listener) {
+        addHeaderClickListener(listener);
+    }
+
+    /**
      * Removes a header click listener
      * 
      * @param listener
      *            The listener to remove.
      */
-    public void removeListener(HeaderClickListener listener) {
+    public void removeHeaderClickListener(HeaderClickListener listener) {
         removeListener(TableConstants.HEADER_CLICK_EVENT_ID,
                 HeaderClickEvent.class, listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeHeaderClickListener(HeaderClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(HeaderClickListener listener) {
+        removeHeaderClickListener(listener);
+    }
+
+    /**
      * Adds a footer click listener which handles the click events when the user
      * clicks on a column footer cell in the Table.
      * <p>
@@ -4954,24 +4990,42 @@ public class Table extends AbstractSelect implements Action.Container,
      * @param listener
      *            The handler which should handle the footer click events.
      */
-    public void addListener(FooterClickListener listener) {
+    public void addFooterClickListener(FooterClickListener listener) {
         addListener(TableConstants.FOOTER_CLICK_EVENT_ID,
                 FooterClickEvent.class, listener,
                 FooterClickEvent.FOOTER_CLICK_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFooterClickListener(FooterClickListener)}
+     **/
+    @Deprecated
+    public void addListener(FooterClickListener listener) {
+        addFooterClickListener(listener);
+    }
+
+    /**
      * Removes a footer click listener
      * 
      * @param listener
      *            The listener to remove.
      */
-    public void removeListener(FooterClickListener listener) {
+    public void removeFooterClickListener(FooterClickListener listener) {
         removeListener(TableConstants.FOOTER_CLICK_EVENT_ID,
                 FooterClickEvent.class, listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFooterClickListener(FooterClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(FooterClickListener listener) {
+        removeFooterClickListener(listener);
+    }
+
+    /**
      * Gets the footer caption beneath the rows
      * 
      * @param propertyId
@@ -5122,24 +5176,42 @@ public class Table extends AbstractSelect implements Action.Container,
      * @param listener
      *            The listener to attach to the Table
      */
-    public void addListener(ColumnResizeListener listener) {
+    public void addColumnResizeListener(ColumnResizeListener listener) {
         addListener(TableConstants.COLUMN_RESIZE_EVENT_ID,
                 ColumnResizeEvent.class, listener,
                 ColumnResizeEvent.COLUMN_RESIZE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addColumnResizeListener(ColumnResizeListener)}
+     **/
+    @Deprecated
+    public void addListener(ColumnResizeListener listener) {
+        addColumnResizeListener(listener);
+    }
+
+    /**
      * Removes a column resize listener from the Table.
      * 
      * @param listener
      *            The listener to remove
      */
-    public void removeListener(ColumnResizeListener listener) {
+    public void removeColumnResizeListener(ColumnResizeListener listener) {
         removeListener(TableConstants.COLUMN_RESIZE_EVENT_ID,
                 ColumnResizeEvent.class, listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeColumnResizeListener(ColumnResizeListener)}
+     **/
+    @Deprecated
+    public void removeListener(ColumnResizeListener listener) {
+        removeColumnResizeListener(listener);
+    }
+
+    /**
      * This event is fired when a columns are reordered by the end user user.
      */
     public static class ColumnReorderEvent extends Component.Event {
@@ -5188,23 +5260,41 @@ public class Table extends AbstractSelect implements Action.Container,
      * @param listener
      *            The listener to attach to the Table
      */
-    public void addListener(ColumnReorderListener listener) {
+    public void addColumnReorderListener(ColumnReorderListener listener) {
         addListener(TableConstants.COLUMN_REORDER_EVENT_ID,
                 ColumnReorderEvent.class, listener, ColumnReorderEvent.METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addColumnReorderListener(ColumnReorderListener)}
+     **/
+    @Deprecated
+    public void addListener(ColumnReorderListener listener) {
+        addColumnReorderListener(listener);
+    }
+
+    /**
      * Removes a column reorder listener from the Table.
      * 
      * @param listener
      *            The listener to remove
      */
-    public void removeListener(ColumnReorderListener listener) {
+    public void removeColumnReorderListener(ColumnReorderListener listener) {
         removeListener(TableConstants.COLUMN_REORDER_EVENT_ID,
                 ColumnReorderEvent.class, listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeColumnReorderListener(ColumnReorderListener)}
+     **/
+    @Deprecated
+    public void removeListener(ColumnReorderListener listener) {
+        removeColumnReorderListener(listener);
+    }
+
+    /**
      * Set the item description generator which generates tooltips for cells and
      * rows in the Table
      * 
diff --git a/server/src/com/vaadin/ui/Tree.java b/server/src/com/vaadin/ui/Tree.java
index 2d6673a67d..9cf1aa3511 100644
--- a/server/src/com/vaadin/ui/Tree.java
+++ b/server/src/com/vaadin/ui/Tree.java
@@ -49,13 +49,13 @@ import com.vaadin.event.dd.TargetDetails;
 import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion;
 import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion;
 import com.vaadin.event.dd.acceptcriteria.TargetDetailIs;
+import com.vaadin.server.KeyMapper;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.shared.ui.tree.TreeConstants;
-import com.vaadin.terminal.KeyMapper;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
 import com.vaadin.tools.ReflectTools;
 
 /**
@@ -906,22 +906,40 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * @param listener
      *            the Listener to be added.
      */
-    public void addListener(ExpandListener listener) {
+    public void addExpandListener(ExpandListener listener) {
         addListener(ExpandEvent.class, listener, ExpandListener.EXPAND_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addExpandListener(ExpandListener)}
+     **/
+    @Deprecated
+    public void addListener(ExpandListener listener) {
+        addExpandListener(listener);
+    }
+
+    /**
      * Removes the expand listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
-    public void removeListener(ExpandListener listener) {
+    public void removeExpandListener(ExpandListener listener) {
         removeListener(ExpandEvent.class, listener,
                 ExpandListener.EXPAND_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeExpandListener(ExpandListener)}
+     **/
+    @Deprecated
+    public void removeListener(ExpandListener listener) {
+        removeExpandListener(listener);
+    }
+
+    /**
      * Emits the expand event.
      * 
      * @param itemId
@@ -991,23 +1009,41 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * @param listener
      *            the Listener to be added.
      */
-    public void addListener(CollapseListener listener) {
+    public void addCollapseListener(CollapseListener listener) {
         addListener(CollapseEvent.class, listener,
                 CollapseListener.COLLAPSE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addCollapseListener(CollapseListener)}
+     **/
+    @Deprecated
+    public void addListener(CollapseListener listener) {
+        addCollapseListener(listener);
+    }
+
+    /**
      * Removes the collapse listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
-    public void removeListener(CollapseListener listener) {
+    public void removeCollapseListener(CollapseListener listener) {
         removeListener(CollapseEvent.class, listener,
                 CollapseListener.COLLAPSE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeCollapseListener(CollapseListener)}
+     **/
+    @Deprecated
+    public void removeListener(CollapseListener listener) {
+        removeCollapseListener(listener);
+    }
+
+    /**
      * Emits collapse event.
      * 
      * @param itemId
@@ -1162,18 +1198,36 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     private DropHandler dropHandler;
 
     @Override
-    public void addListener(ItemClickListener listener) {
+    public void addItemClickListener(ItemClickListener listener) {
         addListener(TreeConstants.ITEM_CLICK_EVENT_ID, ItemClickEvent.class,
                 listener, ItemClickEvent.ITEM_CLICK_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemClickListener(ItemClickListener)}
+     **/
+    @Deprecated
+    public void addListener(ItemClickListener listener) {
+        addItemClickListener(listener);
+    }
+
     @Override
-    public void removeListener(ItemClickListener listener) {
+    public void removeItemClickListener(ItemClickListener listener) {
         removeListener(TreeConstants.ITEM_CLICK_EVENT_ID, ItemClickEvent.class,
                 listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeItemClickListener(ItemClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(ItemClickListener listener) {
+        removeItemClickListener(listener);
+    }
+
+    /**
      * Sets the {@link ItemStyleGenerator} to be used with this tree.
      * 
      * @param itemStyleGenerator
@@ -1449,7 +1503,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
          * 
          * @see
          * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#paintResponse(
-         * com.vaadin.terminal.PaintTarget)
+         * com.vaadin.server.PaintTarget)
          */
         @Override
         public void paintResponse(PaintTarget target) throws PaintException {
diff --git a/server/src/com/vaadin/ui/TreeTable.java b/server/src/com/vaadin/ui/TreeTable.java
index 05757a6d09..ef5850a8af 100644
--- a/server/src/com/vaadin/ui/TreeTable.java
+++ b/server/src/com/vaadin/ui/TreeTable.java
@@ -32,10 +32,10 @@ import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.util.ContainerHierarchicalWrapper;
 import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.data.util.HierarchicalContainerOrderedWrapper;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.treetable.TreeTableConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
 import com.vaadin.ui.Tree.CollapseEvent;
 import com.vaadin.ui.Tree.CollapseListener;
 import com.vaadin.ui.Tree.ExpandEvent;
@@ -752,22 +752,40 @@ public class TreeTable extends Table implements Hierarchical {
      * @param listener
      *            the Listener to be added.
      */
-    public void addListener(ExpandListener listener) {
+    public void addExpandListener(ExpandListener listener) {
         addListener(ExpandEvent.class, listener, ExpandListener.EXPAND_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addExpandListener(ExpandListener)}
+     **/
+    @Deprecated
+    public void addListener(ExpandListener listener) {
+        addExpandListener(listener);
+    }
+
+    /**
      * Removes an expand listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
-    public void removeListener(ExpandListener listener) {
+    public void removeExpandListener(ExpandListener listener) {
         removeListener(ExpandEvent.class, listener,
                 ExpandListener.EXPAND_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeExpandListener(ExpandListener)}
+     **/
+    @Deprecated
+    public void removeListener(ExpandListener listener) {
+        removeExpandListener(listener);
+    }
+
+    /**
      * Emits an expand event.
      * 
      * @param itemId
@@ -783,23 +801,41 @@ public class TreeTable extends Table implements Hierarchical {
      * @param listener
      *            the Listener to be added.
      */
-    public void addListener(CollapseListener listener) {
+    public void addCollapseListener(CollapseListener listener) {
         addListener(CollapseEvent.class, listener,
                 CollapseListener.COLLAPSE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addCollapseListener(CollapseListener)}
+     **/
+    @Deprecated
+    public void addListener(CollapseListener listener) {
+        addCollapseListener(listener);
+    }
+
+    /**
      * Removes a collapse listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
-    public void removeListener(CollapseListener listener) {
+    public void removeCollapseListener(CollapseListener listener) {
         removeListener(CollapseEvent.class, listener,
                 CollapseListener.COLLAPSE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeCollapseListener(CollapseListener)}
+     **/
+    @Deprecated
+    public void removeListener(CollapseListener listener) {
+        removeCollapseListener(listener);
+    }
+
+    /**
      * Emits a collapse event.
      * 
      * @param itemId
diff --git a/server/src/com/vaadin/ui/TwinColSelect.java b/server/src/com/vaadin/ui/TwinColSelect.java
index 891e695a5f..76f1e1e8c7 100644
--- a/server/src/com/vaadin/ui/TwinColSelect.java
+++ b/server/src/com/vaadin/ui/TwinColSelect.java
@@ -19,9 +19,9 @@ package com.vaadin.ui;
 import java.util.Collection;
 
 import com.vaadin.data.Container;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
 
 /**
  * Multiselect component with two lists: left side for available items and right
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 17a028bcdf..a59b96d27a 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -34,22 +34,22 @@ import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ActionManager;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
+import com.vaadin.server.AbstractApplicationServlet;
+import com.vaadin.server.Page;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.LegacyComponent;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.Page.BrowserWindowResizeEvent;
+import com.vaadin.server.Page.BrowserWindowResizeListener;
+import com.vaadin.server.WrappedRequest.BrowserDetails;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.BorderStyle;
 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.Page;
-import com.vaadin.terminal.Page.BrowserWindowResizeEvent;
-import com.vaadin.terminal.Page.BrowserWindowResizeListener;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedRequest.BrowserDetails;
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
 import com.vaadin.tools.ReflectTools;
 
 /**
@@ -90,7 +90,7 @@ import com.vaadin.tools.ReflectTools;
  * @since 7.0
  */
 public abstract class UI extends AbstractComponentContainer implements
-        Action.Container, Action.Notifier, Vaadin6Component {
+        Action.Container, Action.Notifier, LegacyComponent {
 
     /**
      * Helper class to emulate the main window from Vaadin 6 using UIs. This
@@ -1094,45 +1094,39 @@ public abstract class UI extends AbstractComponentContainer implements
      * @param listener
      *            The listener to add
      */
-    public void addListener(ClickListener listener) {
+    public void addClickListener(ClickListener listener) {
         addListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class, listener,
                 ClickListener.clickMethod);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addClickListener(ClickListener)}
+     **/
+    @Deprecated
+    public void addListener(ClickListener listener) {
+        addClickListener(listener);
+    }
+
+    /**
      * Remove a click listener from the UI. The listener should earlier have
      * been added using {@link #addListener(ClickListener)}.
      * 
      * @param listener
      *            The listener to remove
      */
-    public void removeListener(ClickListener listener) {
+    public void removeClickListener(ClickListener listener) {
         removeListener(EventId.CLICK_EVENT_IDENTIFIER, ClickEvent.class,
                 listener);
     }
 
     /**
-     * Adds a close listener to the UI. The listener is called when the UI is
-     * removed from the application.
-     * 
-     * @param listener
-     *            The listener to add.
-     */
-    public void addListener(CloseListener listener) {
-        addListener(CloseEvent.CLOSE_EVENT_IDENTIFIER, CloseEvent.class,
-                listener, CloseListener.closeMethod);
-    }
-
-    /**
-     * Removes a close listener from the UI if it has previously been added with
-     * {@link #addListener(ClickListener)}. Otherwise, has no effect.
-     * 
-     * @param listener
-     *            The listener to remove.
-     */
-    public void removeListener(CloseListener listener) {
-        removeListener(CloseEvent.CLOSE_EVENT_IDENTIFIER, CloseEvent.class,
-                listener);
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeClickListener(ClickListener)}
+     **/
+    @Deprecated
+    public void removeListener(ClickListener listener) {
+        removeClickListener(listener);
     }
 
     @Override
diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java
index 619db07eea..2323b22e17 100644
--- a/server/src/com/vaadin/ui/Upload.java
+++ b/server/src/com/vaadin/ui/Upload.java
@@ -24,12 +24,12 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.StreamVariable.StreamingProgressEvent;
-import com.vaadin.terminal.Vaadin6Component;
-import com.vaadin.terminal.gwt.server.NoInputStreamException;
-import com.vaadin.terminal.gwt.server.NoOutputStreamException;
+import com.vaadin.server.NoInputStreamException;
+import com.vaadin.server.NoOutputStreamException;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.LegacyComponent;
+import com.vaadin.server.StreamVariable.StreamingProgressEvent;
 
 /**
  * Component for uploading files from client to server.
@@ -71,7 +71,7 @@ import com.vaadin.terminal.gwt.server.NoOutputStreamException;
  */
 @SuppressWarnings("serial")
 public class Upload extends AbstractComponent implements Component.Focusable,
-        Vaadin6Component {
+        LegacyComponent {
 
     /**
      * Should the field be focused on next repaint?
@@ -570,87 +570,159 @@ public class Upload extends AbstractComponent implements Component.Focusable,
      * @param listener
      *            the Listener to be added.
      */
-    public void addListener(StartedListener listener) {
+    public void addStartedListener(StartedListener listener) {
         addListener(StartedEvent.class, listener, UPLOAD_STARTED_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addStartedListener(StartedListener)}
+     **/
+    @Deprecated
+    public void addListener(StartedListener listener) {
+        addStartedListener(listener);
+    }
+
+    /**
      * Removes the upload started event listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
-    public void removeListener(StartedListener listener) {
+    public void removeStartedListener(StartedListener listener) {
         removeListener(StartedEvent.class, listener, UPLOAD_STARTED_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeStartedListener(StartedListener)}
+     **/
+    @Deprecated
+    public void removeListener(StartedListener listener) {
+        removeStartedListener(listener);
+    }
+
+    /**
      * Adds the upload received event listener.
      * 
      * @param listener
      *            the Listener to be added.
      */
-    public void addListener(FinishedListener listener) {
+    public void addFinishedListener(FinishedListener listener) {
         addListener(FinishedEvent.class, listener, UPLOAD_FINISHED_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFinishedListener(FinishedListener)}
+     **/
+    @Deprecated
+    public void addListener(FinishedListener listener) {
+        addFinishedListener(listener);
+    }
+
+    /**
      * Removes the upload received event listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
-    public void removeListener(FinishedListener listener) {
+    public void removeFinishedListener(FinishedListener listener) {
         removeListener(FinishedEvent.class, listener, UPLOAD_FINISHED_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFinishedListener(FinishedListener)}
+     **/
+    @Deprecated
+    public void removeListener(FinishedListener listener) {
+        removeFinishedListener(listener);
+    }
+
+    /**
      * Adds the upload interrupted event listener.
      * 
      * @param listener
      *            the Listener to be added.
      */
-    public void addListener(FailedListener listener) {
+    public void addFailedListener(FailedListener listener) {
         addListener(FailedEvent.class, listener, UPLOAD_FAILED_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFailedListener(FailedListener)}
+     **/
+    @Deprecated
+    public void addListener(FailedListener listener) {
+        addFailedListener(listener);
+    }
+
+    /**
      * Removes the upload interrupted event listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
-    public void removeListener(FailedListener listener) {
+    public void removeFailedListener(FailedListener listener) {
         removeListener(FailedEvent.class, listener, UPLOAD_FAILED_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFailedListener(FailedListener)}
+     **/
+    @Deprecated
+    public void removeListener(FailedListener listener) {
+        removeFailedListener(listener);
+    }
+
+    /**
      * Adds the upload success event listener.
      * 
      * @param listener
      *            the Listener to be added.
      */
-    public void addListener(SucceededListener listener) {
+    public void addSucceededListener(SucceededListener listener) {
         addListener(SucceededEvent.class, listener, UPLOAD_SUCCEEDED_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addSucceededListener(SucceededListener)}
+     **/
+    @Deprecated
+    public void addListener(SucceededListener listener) {
+        addSucceededListener(listener);
+    }
+
+    /**
      * Removes the upload success event listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
-    public void removeListener(SucceededListener listener) {
+    public void removeSucceededListener(SucceededListener listener) {
         removeListener(SucceededEvent.class, listener, UPLOAD_SUCCEEDED_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeSucceededListener(SucceededListener)}
+     **/
+    @Deprecated
+    public void removeListener(SucceededListener listener) {
+        removeSucceededListener(listener);
+    }
+
+    /**
      * Adds the upload success event listener.
      * 
      * @param listener
      *            the Listener to be added.
      */
-    public void addListener(ProgressListener listener) {
+    public void addProgressListener(ProgressListener listener) {
         if (progressListeners == null) {
             progressListeners = new LinkedHashSet<ProgressListener>();
         }
@@ -658,18 +730,36 @@ public class Upload extends AbstractComponent implements Component.Focusable,
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addProgressListener(ProgressListener)}
+     **/
+    @Deprecated
+    public void addListener(ProgressListener listener) {
+        addProgressListener(listener);
+    }
+
+    /**
      * Removes the upload success event listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
-    public void removeListener(ProgressListener listener) {
+    public void removeProgressListener(ProgressListener listener) {
         if (progressListeners != null) {
             progressListeners.remove(listener);
         }
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeProgressListener(ProgressListener)}
+     **/
+    @Deprecated
+    public void removeListener(ProgressListener listener) {
+        removeProgressListener(listener);
+    }
+
+    /**
      * Emit upload received event.
      * 
      * @param filename
@@ -936,11 +1026,11 @@ public class Upload extends AbstractComponent implements Component.Focusable,
      * Handle to terminal via Upload monitors and controls the upload during it
      * is being streamed.
      */
-    private com.vaadin.terminal.StreamVariable streamVariable;
+    private com.vaadin.server.StreamVariable streamVariable;
 
-    protected com.vaadin.terminal.StreamVariable getStreamVariable() {
+    protected com.vaadin.server.StreamVariable getStreamVariable() {
         if (streamVariable == null) {
-            streamVariable = new com.vaadin.terminal.StreamVariable() {
+            streamVariable = new com.vaadin.server.StreamVariable() {
                 private StreamingStartEvent lastStartedEvent;
 
                 @Override
diff --git a/server/src/com/vaadin/ui/Video.java b/server/src/com/vaadin/ui/Video.java
index b54d404da6..2d83538d57 100644
--- a/server/src/com/vaadin/ui/Video.java
+++ b/server/src/com/vaadin/ui/Video.java
@@ -16,9 +16,9 @@
 
 package com.vaadin.ui;
 
+import com.vaadin.server.Resource;
+import com.vaadin.shared.ui.video.VideoConstants;
 import com.vaadin.shared.ui.video.VideoState;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.gwt.server.ResourceReference;
 
 /**
  * The Video component translates into an HTML5 &lt;video&gt; element and as
@@ -79,14 +79,14 @@ public class Video extends AbstractMedia {
      * @param poster
      */
     public void setPoster(Resource poster) {
-        getState().setPoster(ResourceReference.create(poster));
+        setResource(VideoConstants.POSTER_RESOURCE, poster);
     }
 
     /**
      * @return The poster image.
      */
     public Resource getPoster() {
-        return ResourceReference.getResource(getState().getPoster());
+        return getResource(VideoConstants.POSTER_RESOURCE);
     }
 
 }
diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java
index 6102350566..aaf0fbc492 100644
--- a/server/src/com/vaadin/ui/Window.java
+++ b/server/src/com/vaadin/ui/Window.java
@@ -31,12 +31,12 @@ import com.vaadin.event.ShortcutAction;
 import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.event.ShortcutAction.ModifierKey;
 import com.vaadin.event.ShortcutListener;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.LegacyComponent;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.window.WindowServerRpc;
 import com.vaadin.shared.ui.window.WindowState;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * A component that represents a floating popup window that can be added to a
@@ -65,7 +65,7 @@ import com.vaadin.terminal.Vaadin6Component;
  */
 @SuppressWarnings("serial")
 public class Window extends Panel implements FocusNotifier, BlurNotifier,
-        Vaadin6Component {
+        LegacyComponent {
 
     private WindowServerRpc rpc = new WindowServerRpc() {
 
@@ -127,7 +127,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.ui.Panel#paintContent(com.vaadin.terminal.PaintTarget)
+     * @see com.vaadin.ui.Panel#paintContent(com.vaadin.server.PaintTarget)
      */
 
     @Override
@@ -362,11 +362,20 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
      * @param listener
      *            the CloseListener to add.
      */
-    public void addListener(CloseListener listener) {
+    public void addCloseListener(CloseListener listener) {
         addListener(CloseEvent.class, listener, WINDOW_CLOSE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addCloseListener(CloseListener)}
+     **/
+    @Deprecated
+    public void addListener(CloseListener listener) {
+        addCloseListener(listener);
+    }
+
+    /**
      * Removes the CloseListener from the window.
      * 
      * <p>
@@ -376,10 +385,19 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
      * @param listener
      *            the CloseListener to remove.
      */
-    public void removeListener(CloseListener listener) {
+    public void removeCloseListener(CloseListener listener) {
         removeListener(CloseEvent.class, listener, WINDOW_CLOSE_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeCloseListener(CloseListener)}
+     **/
+    @Deprecated
+    public void removeListener(CloseListener listener) {
+        removeCloseListener(listener);
+    }
+
     protected void fireClose() {
         fireEvent(new Window.CloseEvent(this));
     }
@@ -438,20 +456,38 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
      * 
      * @param listener
      */
-    public void addListener(ResizeListener listener) {
+    public void addResizeListener(ResizeListener listener) {
         addListener(ResizeEvent.class, listener, WINDOW_RESIZE_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addResizeListener(ResizeListener)}
+     **/
+    @Deprecated
+    public void addListener(ResizeListener listener) {
+        addResizeListener(listener);
+    }
+
+    /**
      * Remove a resize listener.
      * 
      * @param listener
      */
-    public void removeListener(ResizeListener listener) {
+    public void removeResizeListener(ResizeListener listener) {
         removeListener(ResizeEvent.class, listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeResizeListener(ResizeListener)}
+     **/
+    @Deprecated
+    public void removeListener(ResizeListener listener) {
+        removeResizeListener(listener);
+    }
+
+    /**
      * Fire the resize event.
      */
     protected void fireResize() {
@@ -748,17 +784,35 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
      */
 
     @Override
-    public void addListener(FocusListener listener) {
+    public void addFocusListener(FocusListener listener) {
         addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void addListener(FocusListener listener) {
+        addFocusListener(listener);
+    }
+
     @Override
-    public void removeListener(FocusListener listener) {
+    public void removeFocusListener(FocusListener listener) {
         removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeFocusListener(FocusListener)}
+     **/
+    @Deprecated
+    public void removeListener(FocusListener listener) {
+        removeFocusListener(listener);
+    }
+
+    /**
      * Note, that focus/blur listeners in Window class are only supported by sub
      * windows. Also note that Window is not considered focused if its contained
      * component currently has focus.
@@ -767,17 +821,34 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
      */
 
     @Override
-    public void addListener(BlurListener listener) {
+    public void addBlurListener(BlurListener listener) {
         addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by {@link #addBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void addListener(BlurListener listener) {
+        addBlurListener(listener);
+    }
+
     @Override
-    public void removeListener(BlurListener listener) {
+    public void removeBlurListener(BlurListener listener) {
         removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeBlurListener(BlurListener)}
+     **/
+    @Deprecated
+    public void removeListener(BlurListener listener) {
+        removeBlurListener(listener);
+    }
+
+    /**
      * {@inheritDoc}
      * 
      * If the window is a sub-window focusing will cause the sub-window to be
diff --git a/tests/server-side/com/vaadin/data/util/AbstractBeanContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java
index 3c74a45bd7..3c74a45bd7 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractBeanContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractContainerTest.java
index d703fb0364..b0151a6690 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractContainerTest.java
@@ -318,8 +318,7 @@ public abstract class AbstractContainerTest extends TestCase {
                 FULLY_QUALIFIED_NAME, "ab", false, false));
 
         validateContainer(container, "com.vaadin.data.BufferedValidatable",
-                "com.vaadin.ui.TabSheet",
-                "com.vaadin.terminal.gwt.client.Focusable",
+                "com.vaadin.ui.TabSheet", "com.vaadin.client.Focusable",
                 "com.vaadin.data.Buffered", isFilteredOutItemNull(), 20);
 
         // Filter by "contains da" (reversed as ad here)
@@ -328,9 +327,9 @@ public abstract class AbstractContainerTest extends TestCase {
                 REVERSE_FULLY_QUALIFIED_NAME, "ad", false, false));
 
         validateContainer(container, "com.vaadin.data.Buffered",
-                "com.vaadin.terminal.gwt.server.ComponentSizeValidator",
+                "com.vaadin.server.ComponentSizeValidator",
                 "com.vaadin.data.util.IndexedContainer",
-                "com.vaadin.terminal.gwt.client.ui.VUriFragmentUtility",
+                "com.vaadin.client.ui.VUriFragmentUtility",
                 isFilteredOutItemNull(), 37);
     }
 
@@ -382,14 +381,13 @@ public abstract class AbstractContainerTest extends TestCase {
 
         validateContainer(container, "com.vaadin.Application",
                 "org.vaadin.test.LastClass",
-                "com.vaadin.terminal.ApplicationResource", "blah", true,
+                "com.vaadin.server.ApplicationResource", "blah", true,
                 sampleData.length);
 
         sortable.sort(new Object[] { REVERSE_FULLY_QUALIFIED_NAME },
                 new boolean[] { true });
 
-        validateContainer(container,
-                "com.vaadin.terminal.gwt.server.ApplicationPortlet2",
+        validateContainer(container, "com.vaadin.server.ApplicationPortlet2",
                 "com.vaadin.data.util.ObjectProperty",
                 "com.vaadin.ui.BaseFieldFactory", "blah", true,
                 sampleData.length);
@@ -476,163 +474,143 @@ public abstract class AbstractContainerTest extends TestCase {
             "com.vaadin.launcher.util.BrowserLauncher",
             "com.vaadin.service.ApplicationContext",
             "com.vaadin.service.FileTypeResolver",
-            "com.vaadin.terminal.ApplicationResource",
-            "com.vaadin.terminal.ClassResource",
-            "com.vaadin.terminal.CompositeErrorMessage",
-            "com.vaadin.terminal.DownloadStream",
-            "com.vaadin.terminal.ErrorMessage",
-            "com.vaadin.terminal.ExternalResource",
-            "com.vaadin.terminal.FileResource",
-            "com.vaadin.terminal.gwt.client.ApplicationConfiguration",
-            "com.vaadin.terminal.gwt.client.ApplicationConnection",
-            "com.vaadin.terminal.gwt.client.BrowserInfo",
-            "com.vaadin.terminal.gwt.client.ClientExceptionHandler",
-            "com.vaadin.terminal.gwt.client.ComponentDetail",
-            "com.vaadin.terminal.gwt.client.ComponentDetailMap",
-            "com.vaadin.terminal.gwt.client.ComponentLocator",
-            "com.vaadin.terminal.gwt.client.Console",
-            "com.vaadin.terminal.gwt.client.Container",
-            "com.vaadin.terminal.gwt.client.ContainerResizedListener",
-            "com.vaadin.terminal.gwt.client.CSSRule",
-            "com.vaadin.terminal.gwt.client.DateTimeService",
-            "com.vaadin.terminal.gwt.client.DefaultWidgetSet",
-            "com.vaadin.terminal.gwt.client.Focusable",
-            "com.vaadin.terminal.gwt.client.HistoryImplIEVaadin",
-            "com.vaadin.terminal.gwt.client.LocaleNotLoadedException",
-            "com.vaadin.terminal.gwt.client.LocaleService",
-            "com.vaadin.terminal.gwt.client.MouseEventDetails",
-            "com.vaadin.terminal.gwt.client.NullConsole",
-            "com.vaadin.terminal.gwt.client.Paintable",
-            "com.vaadin.terminal.gwt.client.RenderInformation",
-            "com.vaadin.terminal.gwt.client.RenderSpace",
-            "com.vaadin.terminal.gwt.client.StyleConstants",
-            "com.vaadin.terminal.gwt.client.TooltipInfo",
-            "com.vaadin.terminal.gwt.client.ui.Action",
-            "com.vaadin.terminal.gwt.client.ui.ActionOwner",
-            "com.vaadin.terminal.gwt.client.ui.AlignmentInfo",
-            "com.vaadin.terminal.gwt.client.ui.CalendarEntry",
-            "com.vaadin.terminal.gwt.client.ui.ClickEventHandler",
-            "com.vaadin.terminal.gwt.client.ui.Field",
-            "com.vaadin.terminal.gwt.client.ui.Icon",
-            "com.vaadin.terminal.gwt.client.ui.layout.CellBasedLayout",
-            "com.vaadin.terminal.gwt.client.ui.layout.ChildComponentContainer",
-            "com.vaadin.terminal.gwt.client.ui.layout.Margins",
-            "com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler",
-            "com.vaadin.terminal.gwt.client.ui.MenuBar",
-            "com.vaadin.terminal.gwt.client.ui.MenuItem",
-            "com.vaadin.terminal.gwt.client.ui.richtextarea.VRichTextArea",
-            "com.vaadin.terminal.gwt.client.ui.richtextarea.VRichTextToolbar",
-            "com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler",
-            "com.vaadin.terminal.gwt.client.ui.SubPartAware",
-            "com.vaadin.terminal.gwt.client.ui.Table",
-            "com.vaadin.terminal.gwt.client.ui.TreeAction",
-            "com.vaadin.terminal.gwt.client.ui.TreeImages",
-            "com.vaadin.terminal.gwt.client.ui.VAbsoluteLayout",
-            "com.vaadin.terminal.gwt.client.ui.VAccordion",
-            "com.vaadin.terminal.gwt.client.ui.VButton",
-            "com.vaadin.terminal.gwt.client.ui.VCalendarPanel",
-            "com.vaadin.terminal.gwt.client.ui.VCheckBox",
-            "com.vaadin.terminal.gwt.client.ui.VContextMenu",
-            "com.vaadin.terminal.gwt.client.ui.VCssLayout",
-            "com.vaadin.terminal.gwt.client.ui.VCustomComponent",
-            "com.vaadin.terminal.gwt.client.ui.VCustomLayout",
-            "com.vaadin.terminal.gwt.client.ui.VDateField",
-            "com.vaadin.terminal.gwt.client.ui.VDateFieldCalendar",
-            "com.vaadin.terminal.gwt.client.ui.VEmbedded",
-            "com.vaadin.terminal.gwt.client.ui.VFilterSelect",
-            "com.vaadin.terminal.gwt.client.ui.VForm",
-            "com.vaadin.terminal.gwt.client.ui.VFormLayout",
-            "com.vaadin.terminal.gwt.client.ui.VGridLayout",
-            "com.vaadin.terminal.gwt.client.ui.VHorizontalLayout",
-            "com.vaadin.terminal.gwt.client.ui.VLabel",
-            "com.vaadin.terminal.gwt.client.ui.VLink",
-            "com.vaadin.terminal.gwt.client.ui.VListSelect",
-            "com.vaadin.terminal.gwt.client.ui.VMarginInfo",
-            "com.vaadin.terminal.gwt.client.ui.VMenuBar",
-            "com.vaadin.terminal.gwt.client.ui.VNativeButton",
-            "com.vaadin.terminal.gwt.client.ui.VNativeSelect",
-            "com.vaadin.terminal.gwt.client.ui.VNotification",
-            "com.vaadin.terminal.gwt.client.ui.VOptionGroup",
-            "com.vaadin.terminal.gwt.client.ui.VOptionGroupBase",
-            "com.vaadin.terminal.gwt.client.ui.VOrderedLayout",
-            "com.vaadin.terminal.gwt.client.ui.VOverlay",
-            "com.vaadin.terminal.gwt.client.ui.VPanel",
-            "com.vaadin.terminal.gwt.client.ui.VPasswordField",
-            "com.vaadin.terminal.gwt.client.ui.VPopupCalendar",
-            "com.vaadin.terminal.gwt.client.ui.VPopupView",
-            "com.vaadin.terminal.gwt.client.ui.VProgressIndicator",
-            "com.vaadin.terminal.gwt.client.ui.VScrollTable",
-            "com.vaadin.terminal.gwt.client.ui.VSlider",
-            "com.vaadin.terminal.gwt.client.ui.VSplitPanel",
-            "com.vaadin.terminal.gwt.client.ui.VSplitPanelHorizontal",
-            "com.vaadin.terminal.gwt.client.ui.VSplitPanelVertical",
-            "com.vaadin.terminal.gwt.client.ui.VTablePaging",
-            "com.vaadin.terminal.gwt.client.ui.VTabsheet",
-            "com.vaadin.terminal.gwt.client.ui.VTabsheetBase",
-            "com.vaadin.terminal.gwt.client.ui.VTabsheetPanel",
-            "com.vaadin.terminal.gwt.client.ui.VTextArea",
-            "com.vaadin.terminal.gwt.client.ui.VTextField",
-            "com.vaadin.terminal.gwt.client.ui.VTextualDate",
-            "com.vaadin.terminal.gwt.client.ui.VTime",
-            "com.vaadin.terminal.gwt.client.ui.VTree",
-            "com.vaadin.terminal.gwt.client.ui.VTwinColSelect",
-            "com.vaadin.terminal.gwt.client.ui.VUnknownComponent",
-            "com.vaadin.terminal.gwt.client.ui.VUpload",
-            "com.vaadin.terminal.gwt.client.ui.VUriFragmentUtility",
-            "com.vaadin.terminal.gwt.client.ui.VVerticalLayout",
-            "com.vaadin.terminal.gwt.client.ui.VView",
-            "com.vaadin.terminal.gwt.client.ui.VWindow",
-            "com.vaadin.terminal.gwt.client.UIDL",
-            "com.vaadin.terminal.gwt.client.Util",
-            "com.vaadin.terminal.gwt.client.ValueMap",
-            "com.vaadin.terminal.gwt.client.VCaption",
-            "com.vaadin.terminal.gwt.client.VCaptionWrapper",
-            "com.vaadin.terminal.gwt.client.VDebugConsole",
-            "com.vaadin.terminal.gwt.client.VErrorMessage",
-            "com.vaadin.terminal.gwt.client.VTooltip",
-            "com.vaadin.terminal.gwt.client.VUIDLBrowser",
-            "com.vaadin.terminal.gwt.client.WidgetMap",
-            "com.vaadin.terminal.gwt.client.WidgetSet",
-            "com.vaadin.terminal.gwt.server.AbstractApplicationPortlet",
-            "com.vaadin.terminal.gwt.server.AbstractApplicationServlet",
-            "com.vaadin.terminal.gwt.server.AbstractCommunicationManager",
-            "com.vaadin.terminal.gwt.server.AbstractWebApplicationContext",
-            "com.vaadin.terminal.gwt.server.ApplicationPortlet",
-            "com.vaadin.terminal.gwt.server.ApplicationPortlet2",
-            "com.vaadin.terminal.gwt.server.ApplicationRunnerServlet",
-            "com.vaadin.terminal.gwt.server.ApplicationServlet",
-            "com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent",
-            "com.vaadin.terminal.gwt.server.CommunicationManager",
-            "com.vaadin.terminal.gwt.server.ComponentSizeValidator",
-            "com.vaadin.terminal.gwt.server.Constants",
-            "com.vaadin.terminal.gwt.server.GAEApplicationServlet",
-            "com.vaadin.terminal.gwt.server.HttpServletRequestListener",
-            "com.vaadin.terminal.gwt.server.HttpUploadStream",
-            "com.vaadin.terminal.gwt.server.JsonPaintTarget",
-            "com.vaadin.terminal.gwt.server.PortletApplicationContext",
-            "com.vaadin.terminal.gwt.server.PortletApplicationContext2",
-            "com.vaadin.terminal.gwt.server.PortletCommunicationManager",
-            "com.vaadin.terminal.gwt.server.PortletRequestListener",
-            "com.vaadin.terminal.gwt.server.RestrictedRenderResponse",
-            "com.vaadin.terminal.gwt.server.SessionExpiredException",
-            "com.vaadin.terminal.gwt.server.SystemMessageException",
-            "com.vaadin.terminal.gwt.server.WebApplicationContext",
-            "com.vaadin.terminal.gwt.server.WebBrowser",
-            "com.vaadin.terminal.gwt.widgetsetutils.ClassPathExplorer",
-            "com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator",
-            "com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder",
-            "com.vaadin.terminal.KeyMapper", "com.vaadin.terminal.Paintable",
-            "com.vaadin.terminal.PaintException",
-            "com.vaadin.terminal.PaintTarget",
-            "com.vaadin.terminal.ParameterHandler",
-            "com.vaadin.terminal.Resource", "com.vaadin.terminal.Scrollable",
-            "com.vaadin.terminal.Sizeable",
-            "com.vaadin.terminal.StreamResource",
-            "com.vaadin.terminal.SystemError", "com.vaadin.terminal.Terminal",
-            "com.vaadin.terminal.ThemeResource",
-            "com.vaadin.terminal.UploadStream",
-            "com.vaadin.terminal.URIHandler", "com.vaadin.terminal.UserError",
-            "com.vaadin.terminal.VariableOwner",
+            "com.vaadin.server.ApplicationResource",
+            "com.vaadin.server.ClassResource",
+            "com.vaadin.server.CompositeErrorMessage",
+            "com.vaadin.server.DownloadStream",
+            "com.vaadin.server.ErrorMessage",
+            "com.vaadin.server.ExternalResource",
+            "com.vaadin.server.FileResource",
+            "com.vaadin.client.ApplicationConfiguration",
+            "com.vaadin.client.ApplicationConnection",
+            "com.vaadin.client.BrowserInfo",
+            "com.vaadin.client.ClientExceptionHandler",
+            "com.vaadin.client.ComponentDetail",
+            "com.vaadin.client.ComponentDetailMap",
+            "com.vaadin.client.ComponentLocator", "com.vaadin.client.Console",
+            "com.vaadin.client.Container",
+            "com.vaadin.client.ContainerResizedListener",
+            "com.vaadin.client.CSSRule", "com.vaadin.client.DateTimeService",
+            "com.vaadin.client.DefaultWidgetSet",
+            "com.vaadin.client.Focusable",
+            "com.vaadin.client.HistoryImplIEVaadin",
+            "com.vaadin.client.LocaleNotLoadedException",
+            "com.vaadin.client.LocaleService",
+            "com.vaadin.client.MouseEventDetails",
+            "com.vaadin.client.NullConsole", "com.vaadin.client.Paintable",
+            "com.vaadin.client.RenderInformation",
+            "com.vaadin.client.RenderSpace",
+            "com.vaadin.client.StyleConstants",
+            "com.vaadin.client.TooltipInfo", "com.vaadin.client.ui.Action",
+            "com.vaadin.client.ui.ActionOwner",
+            "com.vaadin.client.ui.AlignmentInfo",
+            "com.vaadin.client.ui.CalendarEntry",
+            "com.vaadin.client.ui.ClickEventHandler",
+            "com.vaadin.client.ui.Field", "com.vaadin.client.ui.Icon",
+            "com.vaadin.client.ui.layout.CellBasedLayout",
+            "com.vaadin.client.ui.layout.ChildComponentContainer",
+            "com.vaadin.client.ui.layout.Margins",
+            "com.vaadin.client.ui.LayoutClickEventHandler",
+            "com.vaadin.client.ui.MenuBar", "com.vaadin.client.ui.MenuItem",
+            "com.vaadin.client.ui.richtextarea.VRichTextArea",
+            "com.vaadin.client.ui.richtextarea.VRichTextToolbar",
+            "com.vaadin.client.ui.ShortcutActionHandler",
+            "com.vaadin.client.ui.SubPartAware", "com.vaadin.client.ui.Table",
+            "com.vaadin.client.ui.TreeAction",
+            "com.vaadin.client.ui.TreeImages",
+            "com.vaadin.client.ui.VAbsoluteLayout",
+            "com.vaadin.client.ui.VAccordion", "com.vaadin.client.ui.VButton",
+            "com.vaadin.client.ui.VCalendarPanel",
+            "com.vaadin.client.ui.VCheckBox",
+            "com.vaadin.client.ui.VContextMenu",
+            "com.vaadin.client.ui.VCssLayout",
+            "com.vaadin.client.ui.VCustomComponent",
+            "com.vaadin.client.ui.VCustomLayout",
+            "com.vaadin.client.ui.VDateField",
+            "com.vaadin.client.ui.VDateFieldCalendar",
+            "com.vaadin.client.ui.VEmbedded",
+            "com.vaadin.client.ui.VFilterSelect", "com.vaadin.client.ui.VForm",
+            "com.vaadin.client.ui.VFormLayout",
+            "com.vaadin.client.ui.VGridLayout",
+            "com.vaadin.client.ui.VHorizontalLayout",
+            "com.vaadin.client.ui.VLabel", "com.vaadin.client.ui.VLink",
+            "com.vaadin.client.ui.VListSelect",
+            "com.vaadin.client.ui.VMarginInfo",
+            "com.vaadin.client.ui.VMenuBar",
+            "com.vaadin.client.ui.VNativeButton",
+            "com.vaadin.client.ui.VNativeSelect",
+            "com.vaadin.client.ui.VNotification",
+            "com.vaadin.client.ui.VOptionGroup",
+            "com.vaadin.client.ui.VOptionGroupBase",
+            "com.vaadin.client.ui.VOrderedLayout",
+            "com.vaadin.client.ui.VOverlay", "com.vaadin.client.ui.VPanel",
+            "com.vaadin.client.ui.VPasswordField",
+            "com.vaadin.client.ui.VPopupCalendar",
+            "com.vaadin.client.ui.VPopupView",
+            "com.vaadin.client.ui.VProgressIndicator",
+            "com.vaadin.client.ui.VScrollTable",
+            "com.vaadin.client.ui.VSlider", "com.vaadin.client.ui.VSplitPanel",
+            "com.vaadin.client.ui.VSplitPanelHorizontal",
+            "com.vaadin.client.ui.VSplitPanelVertical",
+            "com.vaadin.client.ui.VTablePaging",
+            "com.vaadin.client.ui.VTabsheet",
+            "com.vaadin.client.ui.VTabsheetBase",
+            "com.vaadin.client.ui.VTabsheetPanel",
+            "com.vaadin.client.ui.VTextArea",
+            "com.vaadin.client.ui.VTextField",
+            "com.vaadin.client.ui.VTextualDate", "com.vaadin.client.ui.VTime",
+            "com.vaadin.client.ui.VTree",
+            "com.vaadin.client.ui.VTwinColSelect",
+            "com.vaadin.client.ui.VUnknownComponent",
+            "com.vaadin.client.ui.VUpload",
+            "com.vaadin.client.ui.VUriFragmentUtility",
+            "com.vaadin.client.ui.VVerticalLayout",
+            "com.vaadin.client.ui.VView", "com.vaadin.client.ui.VWindow",
+            "com.vaadin.client.UIDL", "com.vaadin.client.Util",
+            "com.vaadin.client.ValueMap", "com.vaadin.client.VCaption",
+            "com.vaadin.client.VCaptionWrapper",
+            "com.vaadin.client.VDebugConsole",
+            "com.vaadin.client.VErrorMessage", "com.vaadin.client.VTooltip",
+            "com.vaadin.client.VUIDLBrowser", "com.vaadin.client.WidgetMap",
+            "com.vaadin.client.WidgetSet",
+            "com.vaadin.server.AbstractApplicationPortlet",
+            "com.vaadin.server.AbstractApplicationServlet",
+            "com.vaadin.server.AbstractCommunicationManager",
+            "com.vaadin.server.AbstractWebApplicationContext",
+            "com.vaadin.server.ApplicationPortlet",
+            "com.vaadin.server.ApplicationPortlet2",
+            "com.vaadin.server.ApplicationRunnerServlet",
+            "com.vaadin.server.ApplicationServlet",
+            "com.vaadin.server.ChangeVariablesErrorEvent",
+            "com.vaadin.server.CommunicationManager",
+            "com.vaadin.server.ComponentSizeValidator",
+            "com.vaadin.server.Constants",
+            "com.vaadin.server.GAEApplicationServlet",
+            "com.vaadin.server.HttpServletRequestListener",
+            "com.vaadin.server.HttpUploadStream",
+            "com.vaadin.server.JsonPaintTarget",
+            "com.vaadin.server.PortletApplicationContext",
+            "com.vaadin.server.PortletApplicationContext2",
+            "com.vaadin.server.PortletCommunicationManager",
+            "com.vaadin.server.PortletRequestListener",
+            "com.vaadin.server.RestrictedRenderResponse",
+            "com.vaadin.server.SessionExpiredException",
+            "com.vaadin.server.SystemMessageException",
+            "com.vaadin.server.WebApplicationContext",
+            "com.vaadin.server.WebBrowser",
+            "com.vaadin.server.widgetsetutils.ClassPathExplorer",
+            "com.vaadin.server.widgetsetutils.WidgetMapGenerator",
+            "com.vaadin.server.widgetsetutils.WidgetSetBuilder",
+            "com.vaadin.server.KeyMapper", "com.vaadin.server.Paintable",
+            "com.vaadin.server.PaintException",
+            "com.vaadin.server.PaintTarget",
+            "com.vaadin.server.ParameterHandler", "com.vaadin.server.Resource",
+            "com.vaadin.server.Scrollable", "com.vaadin.server.Sizeable",
+            "com.vaadin.server.StreamResource",
+            "com.vaadin.server.SystemError", "com.vaadin.server.Terminal",
+            "com.vaadin.server.ThemeResource",
+            "com.vaadin.server.UploadStream", "com.vaadin.server.URIHandler",
+            "com.vaadin.server.UserError", "com.vaadin.server.VariableOwner",
             "com.vaadin.tools.ReflectTools",
             "com.vaadin.tools.WidgetsetCompiler",
             "com.vaadin.ui.AbsoluteLayout", "com.vaadin.ui.AbstractComponent",
diff --git a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
index 6bfff90c7b..772cd250ce 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
@@ -149,7 +149,7 @@ public abstract class AbstractHierarchicalContainerTest extends
         int expectedSize = sampleData.length + packages;
         validateHierarchicalContainer(container, "com",
                 "org.vaadin.test.LastClass",
-                "com.vaadin.terminal.ApplicationResource", "blah", true,
+                "com.vaadin.server.ApplicationResource", "blah", true,
                 expectedSize, 2, true);
 
     }
@@ -172,16 +172,16 @@ public abstract class AbstractHierarchicalContainerTest extends
         int expectedSize = sampleData.length + packages;
         validateHierarchicalContainer(container, "com",
                 "org.vaadin.test.LastClass",
-                "com.vaadin.terminal.ApplicationResource", "blah", true,
+                "com.vaadin.server.ApplicationResource", "blah", true,
                 expectedSize, 2, true);
 
         sortable.sort(new Object[] { REVERSE_FULLY_QUALIFIED_NAME },
                 new boolean[] { true });
 
         validateHierarchicalContainer(container,
-                "com.vaadin.terminal.gwt.server.ApplicationPortlet2",
+                "com.vaadin.server.ApplicationPortlet2",
                 "com.vaadin.data.util.ObjectProperty",
-                "com.vaadin.terminal.ApplicationResource", "blah", true,
+                "com.vaadin.server.ApplicationResource", "blah", true,
                 expectedSize, 2, true);
 
     }
diff --git a/tests/server-side/com/vaadin/data/util/AbstractInMemoryContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTest.java
index bbad33c5bc..bbad33c5bc 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractInMemoryContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/BeanContainerTest.java b/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
index 9037e303a8..9037e303a8 100644
--- a/tests/server-side/com/vaadin/data/util/BeanContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/BeanItemContainerSortTest.java b/server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java
index 38f317fef1..38f317fef1 100644
--- a/tests/server-side/com/vaadin/data/util/BeanItemContainerSortTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java
diff --git a/tests/server-side/com/vaadin/data/util/BeanItemContainerTest.java b/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
index 29043b1670..29043b1670 100644
--- a/tests/server-side/com/vaadin/data/util/BeanItemContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/BeanItemTest.java b/server/tests/src/com/vaadin/data/util/BeanItemTest.java
index e1ad75796c..e1ad75796c 100644
--- a/tests/server-side/com/vaadin/data/util/BeanItemTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemTest.java
diff --git a/tests/server-side/com/vaadin/data/util/FileSystemContainerTest.java b/server/tests/src/com/vaadin/data/util/FileSystemContainerTest.java
index f4bb794e5c..f4bb794e5c 100644
--- a/tests/server-side/com/vaadin/data/util/FileSystemContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/FileSystemContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/NestedMethodPropertyTest.java b/server/tests/src/com/vaadin/data/util/NestedMethodPropertyTest.java
index 640ede8743..640ede8743 100644
--- a/tests/server-side/com/vaadin/data/util/NestedMethodPropertyTest.java
+++ b/server/tests/src/com/vaadin/data/util/NestedMethodPropertyTest.java
diff --git a/tests/server-side/com/vaadin/data/util/ObjectPropertyTest.java b/server/tests/src/com/vaadin/data/util/ObjectPropertyTest.java
index 99ca58ba42..99ca58ba42 100644
--- a/tests/server-side/com/vaadin/data/util/ObjectPropertyTest.java
+++ b/server/tests/src/com/vaadin/data/util/ObjectPropertyTest.java
diff --git a/tests/server-side/com/vaadin/data/util/PerformanceTestIndexedContainer.java b/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java
index c4ed12efc0..c4ed12efc0 100644
--- a/tests/server-side/com/vaadin/data/util/PerformanceTestIndexedContainer.java
+++ b/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java
diff --git a/tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java b/server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java
index 14e70d76d4..14e70d76d4 100644
--- a/tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java
+++ b/server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java
diff --git a/tests/server-side/com/vaadin/data/util/PropertySetItemTest.java b/server/tests/src/com/vaadin/data/util/PropertySetItemTest.java
index a3169332ec..a3169332ec 100644
--- a/tests/server-side/com/vaadin/data/util/PropertySetItemTest.java
+++ b/server/tests/src/com/vaadin/data/util/PropertySetItemTest.java
diff --git a/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java b/server/tests/src/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
index ebe604ff3a..ff6de50651 100644
--- a/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
+++ b/server/tests/src/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
@@ -2,9 +2,6 @@ package com.vaadin.data.util;
 
 import java.util.Collection;
 
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
-import com.vaadin.data.util.IndexedContainer;
-
 public class TestContainerHierarchicalWrapper extends
         AbstractHierarchicalContainerTest {
 
@@ -34,7 +31,7 @@ public class TestContainerHierarchicalWrapper extends
         int expectedSize = sampleData.length + packages - 1;
 
         validateContainer(container, "com", "com.vaadin.util.SerializerHelper",
-                "com.vaadin.terminal.ApplicationResource", "blah", true,
+                "com.vaadin.server.ApplicationResource", "blah", true,
                 expectedSize);
 
         // rootItemIds
diff --git a/tests/server-side/com/vaadin/data/util/TestContainerSorting.java b/server/tests/src/com/vaadin/data/util/TestContainerSorting.java
index 497699605a..497699605a 100644
--- a/tests/server-side/com/vaadin/data/util/TestContainerSorting.java
+++ b/server/tests/src/com/vaadin/data/util/TestContainerSorting.java
diff --git a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java b/server/tests/src/com/vaadin/data/util/TestHierarchicalContainer.java
index 9e0558a122..10bc71c3a7 100644
--- a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java
+++ b/server/tests/src/com/vaadin/data/util/TestHierarchicalContainer.java
@@ -2,7 +2,6 @@ package com.vaadin.data.util;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
 
 public class TestHierarchicalContainer extends
         AbstractHierarchicalContainerTest {
@@ -46,7 +45,7 @@ public class TestHierarchicalContainer extends
         assertNull("Parent should be null, is " + p1, p1);
 
         container.removeAllItems();
-        p1 = container.getParent("com.vaadin.terminal.gwt.client.Focusable");
+        p1 = container.getParent("com.vaadin.client.Focusable");
         assertNull("Parent should be null, is " + p1, p1);
 
     }
@@ -58,13 +57,11 @@ public class TestHierarchicalContainer extends
         container.addContainerFilter(FULLY_QUALIFIED_NAME, "ab", false, false);
         Object p1 = container.getParent("com.vaadin.ui.TabSheet");
         assertEquals("com.vaadin.ui", p1);
-        p1 = container
-                .getParent("com.vaadin.terminal.gwt.client.ui.VPopupCalendar");
+        p1 = container.getParent("com.vaadin.client.ui.VPopupCalendar");
         assertNull(p1);
         container.removeAllContainerFilters();
-        p1 = container
-                .getParent("com.vaadin.terminal.gwt.client.ui.VPopupCalendar");
-        assertEquals("com.vaadin.terminal.gwt.client.ui", p1);
+        p1 = container.getParent("com.vaadin.client.ui.VPopupCalendar");
+        assertEquals("com.vaadin.client.ui", p1);
 
     }
 
@@ -110,9 +107,8 @@ public class TestHierarchicalContainer extends
         int expectedRoots = 1;
 
         validateHierarchicalContainer(container, "com",
-                "com.vaadin.ui.TabSheet",
-                "com.vaadin.terminal.gwt.client.Focusable", "blah", true,
-                expectedSize, expectedRoots, true);
+                "com.vaadin.ui.TabSheet", "com.vaadin.client.Focusable",
+                "blah", true, expectedSize, expectedRoots, true);
 
         // only include .gwt.client classes
         container.removeAllContainerFilters();
@@ -126,9 +122,9 @@ public class TestHierarchicalContainer extends
         expectedRoots = 1;
 
         validateHierarchicalContainer(container, "com",
-                "com.vaadin.terminal.gwt.client.WidgetSet",
-                "com.vaadin.terminal.gwt.client.ui.VSplitPanelVertical",
-                "blah", true, expectedSize, expectedRoots, true);
+                "com.vaadin.client.WidgetSet",
+                "com.vaadin.client.ui.VSplitPanelVertical", "blah", true,
+                expectedSize, expectedRoots, true);
 
         // Additionally remove all without 'm' in the simple name.
         container.addContainerFilter(SIMPLE_NAME, "m", false, false);
@@ -136,12 +132,10 @@ public class TestHierarchicalContainer extends
         expectedSize = 7 + 18;
         expectedRoots = 1;
 
-        validateHierarchicalContainer(
-                container,
-                "com",
-                "com.vaadin.terminal.gwt.client.ui.VUriFragmentUtility",
-                "com.vaadin.terminal.gwt.client.ui.layout.ChildComponentContainer",
-                "blah", true, expectedSize, expectedRoots, true);
+        validateHierarchicalContainer(container, "com",
+                "com.vaadin.client.ui.VUriFragmentUtility",
+                "com.vaadin.client.ui.layout.ChildComponentContainer", "blah",
+                true, expectedSize, expectedRoots, true);
 
     }
 
@@ -208,20 +202,20 @@ public class TestHierarchicalContainer extends
         // 20 items match the filter.
         // com.vaadin.data.BufferedValidatable
         // com.vaadin.data.Validatable
-        // com.vaadin.terminal.gwt.client.Focusable
-        // com.vaadin.terminal.gwt.client.Paintable
-        // com.vaadin.terminal.gwt.client.ui.Table
-        // com.vaadin.terminal.gwt.client.ui.VLabel
-        // com.vaadin.terminal.gwt.client.ui.VScrollTable
-        // com.vaadin.terminal.gwt.client.ui.VTablePaging
-        // com.vaadin.terminal.gwt.client.ui.VTabsheet
-        // com.vaadin.terminal.gwt.client.ui.VTabsheetBase
-        // com.vaadin.terminal.gwt.client.ui.VTabsheetPanel
-        // com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent
-        // com.vaadin.terminal.Paintable
-        // com.vaadin.terminal.Scrollable
-        // com.vaadin.terminal.Sizeable
-        // com.vaadin.terminal.VariableOwner
+        // com.vaadin.client.Focusable
+        // com.vaadin.client.Paintable
+        // com.vaadin.client.ui.Table
+        // com.vaadin.client.ui.VLabel
+        // com.vaadin.client.ui.VScrollTable
+        // com.vaadin.client.ui.VTablePaging
+        // com.vaadin.client.ui.VTabsheet
+        // com.vaadin.client.ui.VTabsheetBase
+        // com.vaadin.client.ui.VTabsheetPanel
+        // com.vaadin.server.ChangeVariablesErrorEvent
+        // com.vaadin.server.Paintable
+        // com.vaadin.server.Scrollable
+        // com.vaadin.server.Sizeable
+        // com.vaadin.server.VariableOwner
         // com.vaadin.ui.Label
         // com.vaadin.ui.Table
         // com.vaadin.ui.TableFieldFactory
@@ -232,9 +226,8 @@ public class TestHierarchicalContainer extends
 
         validateHierarchicalContainer(container,
                 "com.vaadin.data.BufferedValidatable",
-                "com.vaadin.ui.TabSheet",
-                "com.vaadin.terminal.gwt.client.ui.VTabsheetBase", "blah",
-                true, expectedSize, expectedRoots, false);
+                "com.vaadin.ui.TabSheet", "com.vaadin.client.ui.VTabsheetBase",
+                "blah", true, expectedSize, expectedRoots, false);
 
         // only include .gwt.client classes
         container.removeAllContainerFilters();
@@ -245,14 +238,14 @@ public class TestHierarchicalContainer extends
         int classes = 110;
 
         expectedSize = packages + classes;
-        expectedRoots = 35 + 1; // com.vaadin.terminal.gwt.client.ui +
-        // com.vaadin.terminal.gwt.client.*
+        expectedRoots = 35 + 1; // com.vaadin.client.ui +
+        // com.vaadin.client.*
 
         // Sorting is case insensitive
         validateHierarchicalContainer(container,
-                "com.vaadin.terminal.gwt.client.ApplicationConfiguration",
-                "com.vaadin.terminal.gwt.client.WidgetSet",
-                "com.vaadin.terminal.gwt.client.ui.VOptionGroup", "blah", true,
+                "com.vaadin.client.ApplicationConfiguration",
+                "com.vaadin.client.WidgetSet",
+                "com.vaadin.client.ui.VOptionGroup", "blah", true,
                 expectedSize, expectedRoots, false);
 
         // Additionally remove all without 'P' in the simple name.
@@ -261,11 +254,10 @@ public class TestHierarchicalContainer extends
         expectedSize = 13;
         expectedRoots = expectedSize;
 
-        validateHierarchicalContainer(container,
-                "com.vaadin.terminal.gwt.client.Paintable",
-                "com.vaadin.terminal.gwt.client.ui.VTabsheetPanel",
-                "com.vaadin.terminal.gwt.client.ui.VPopupCalendar", "blah",
-                true, expectedSize, expectedRoots, false);
+        validateHierarchicalContainer(container, "com.vaadin.client.Paintable",
+                "com.vaadin.client.ui.VTabsheetPanel",
+                "com.vaadin.client.ui.VPopupCalendar", "blah", true,
+                expectedSize, expectedRoots, false);
 
     }
 }
diff --git a/tests/server-side/com/vaadin/data/util/TestIndexedContainer.java b/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java
index 156ff83883..156ff83883 100644
--- a/tests/server-side/com/vaadin/data/util/TestIndexedContainer.java
+++ b/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/AbstractFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/AbstractFilterTest.java
index 6f96c3a51a..6f96c3a51a 100644
--- a/tests/server-side/com/vaadin/data/util/filter/AbstractFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/AbstractFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/AndOrFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
index fdd5b8a645..fdd5b8a645 100644
--- a/tests/server-side/com/vaadin/data/util/filter/AndOrFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/CompareFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
index 99e8429a51..99e8429a51 100644
--- a/tests/server-side/com/vaadin/data/util/filter/CompareFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/IsNullFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
index 6f90273de1..6f90273de1 100644
--- a/tests/server-side/com/vaadin/data/util/filter/IsNullFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/NotFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
index c3b666e6f7..c3b666e6f7 100644
--- a/tests/server-side/com/vaadin/data/util/filter/NotFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/SimpleStringFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
index bc63d57752..bc63d57752 100644
--- a/tests/server-side/com/vaadin/data/util/filter/SimpleStringFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/AllTests.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/AllTests.java
index 057527307f..057527307f 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/AllTests.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/AllTests.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
index 09f620cc2a..7cad310d37 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
@@ -58,8 +58,8 @@ public class ColumnPropertyTest {
 
     @Test(expected = ReadOnlyException.class)
     public void setValue_readOnlyNullable_shouldFail() {
-        ColumnProperty cp = new ColumnProperty("NAME", true, true, true,
-                false, "Ville", String.class);
+        ColumnProperty cp = new ColumnProperty("NAME", true, true, true, false,
+                "Ville", String.class);
         SQLContainer container = EasyMock.createMock(SQLContainer.class);
         new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp));
         EasyMock.replay(container);
@@ -111,8 +111,8 @@ public class ColumnPropertyTest {
 
     @Test
     public void isReadOnly_readOnlyNullable_returnsTrue() {
-        ColumnProperty cp = new ColumnProperty("NAME", true, true, true,
-                false, "Ville", String.class);
+        ColumnProperty cp = new ColumnProperty("NAME", true, true, true, false,
+                "Ville", String.class);
         Assert.assertTrue(cp.isReadOnly());
     }
 
@@ -173,8 +173,8 @@ public class ColumnPropertyTest {
 
     @Test
     public void setValue_resetTonullOnNullable_shouldWork() {
-        ColumnProperty cp = new ColumnProperty("NAME", false, true, true, false,
-                null, String.class);
+        ColumnProperty cp = new ColumnProperty("NAME", false, true, true,
+                false, null, String.class);
         SQLContainer container = EasyMock.createMock(SQLContainer.class);
         new RowItem(container, new RowId(new Object[] { 1 }), Arrays.asList(cp));
         cp.setValue("asdf");
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/DataGenerator.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java
index 489f780d61..489f780d61 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/DataGenerator.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
index b0e2a232ca..b0e2a232ca 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
index d2b6ee2555..d2b6ee2555 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/RowIdTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/RowIdTest.java
index 399db06869..399db06869 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/RowIdTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/RowIdTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
index 438c40823d..438c40823d 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
index 6649bc16e8..6649bc16e8 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/TicketTests.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/TicketTests.java
index a12786f13a..a12786f13a 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/TicketTests.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/TicketTests.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/UtilTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java
index 31bdf2b81b..31bdf2b81b 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/UtilTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
index 65a995120e..65a995120e 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
index 324899e373..324899e373 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
index 147319643d..147319643d 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
index da4cfe4522..da4cfe4522 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
index f1130aad80..f1130aad80 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
index e62a06e6e1..e62a06e6e1 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
index 9b38655186..9b38655186 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
index f635b23ebd..f635b23ebd 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
index e135894013..e135894013 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
diff --git a/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java b/server/tests/src/com/vaadin/server/JSONSerializerTest.java
index 58dfdf246c..05139e6f1a 100644
--- a/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java
+++ b/server/tests/src/com/vaadin/server/JSONSerializerTest.java
@@ -1,4 +1,4 @@
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 /*
  * Copyright 2011 Vaadin Ltd.
@@ -22,13 +22,11 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
+import com.vaadin.server.JsonCodec.BeanProperty;
 import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState;
-import com.vaadin.terminal.gwt.client.communication.JsonDecoder;
-import com.vaadin.terminal.gwt.client.communication.JsonEncoder;
-import com.vaadin.terminal.gwt.server.JsonCodec.BeanProperty;
 
 /**
- * Tests for {@link JsonCodec}, {@link JsonEncoder}, {@link JsonDecoder}
+ * Tests for {@link JsonCodec}
  * 
  * @author Vaadin Ltd
  * @since 7.0
@@ -80,12 +78,6 @@ public class JSONSerializerTest extends TestCase {
                 encoded, null);
         assertTrue("Server decoded", equals(original, serverSideDecoded));
 
-        // Object clientSideDecoded = JsonDecoder.decodeValue(
-        // (com.google.gwt.json.client.JSONArray) JSONParser
-        // .parseStrict(encoded.toString()), null, null, null);
-        // assertTrue("Client decoded",
-        // equals(original, clientSideDecoded));
-
     }
 
     private boolean equals(Object o1, Object o2) throws Exception {
diff --git a/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
index 38fca09157..df16e98bba 100644
--- a/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
@@ -1,4 +1,4 @@
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -15,6 +15,9 @@ import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
+import com.vaadin.server.AbstractApplicationServlet;
+import com.vaadin.server.ApplicationServlet;
+
 import junit.framework.TestCase;
 
 public class TestAbstractApplicationServletStaticFilesLocation extends TestCase {
diff --git a/tests/server-side/com/vaadin/tests/VaadinClasses.java b/server/tests/src/com/vaadin/tests/VaadinClasses.java
index 5d9e38398c..15e1283e47 100644
--- a/tests/server-side/com/vaadin/tests/VaadinClasses.java
+++ b/server/tests/src/com/vaadin/tests/VaadinClasses.java
@@ -84,7 +84,7 @@ public class VaadinClasses {
     public static List<Class<? extends Object>> getAllServerSideClasses() {
         try {
             return findClassesNoTests(Object.class, "com.vaadin", new String[] {
-                    "com.vaadin.tests", "com.vaadin.terminal.gwt.client" });
+                    "com.vaadin.tests", "com.vaadin.client" });
         } catch (IOException e) {
             e.printStackTrace();
             return null;
diff --git a/tests/server-side/com/vaadin/tests/data/bean/Address.java b/server/tests/src/com/vaadin/tests/data/bean/Address.java
index 15cdf34ae5..15cdf34ae5 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/Address.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/Address.java
diff --git a/tests/server-side/com/vaadin/tests/data/bean/BeanToValidate.java b/server/tests/src/com/vaadin/tests/data/bean/BeanToValidate.java
index 416563baba..416563baba 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/BeanToValidate.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/BeanToValidate.java
diff --git a/tests/server-side/com/vaadin/tests/data/bean/Country.java b/server/tests/src/com/vaadin/tests/data/bean/Country.java
index afdf8dcfa1..afdf8dcfa1 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/Country.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/Country.java
diff --git a/tests/server-side/com/vaadin/tests/data/bean/Person.java b/server/tests/src/com/vaadin/tests/data/bean/Person.java
index f7bad31d0e..f7bad31d0e 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/Person.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/Person.java
diff --git a/tests/server-side/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java b/server/tests/src/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
index 93b2273263..93b2273263 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
diff --git a/tests/server-side/com/vaadin/tests/data/bean/Sex.java b/server/tests/src/com/vaadin/tests/data/bean/Sex.java
index a4e3f20a11..a4e3f20a11 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/Sex.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/Sex.java
diff --git a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java
index 6393d61981..6393d61981 100644
--- a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java
diff --git a/tests/server-side/com/vaadin/tests/server/IndexedContainerListeners.java b/server/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java
index 8334c7f183..8334c7f183 100644
--- a/tests/server-side/com/vaadin/tests/server/IndexedContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/PropertysetItemListeners.java b/server/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java
index d493f22779..d493f22779 100644
--- a/tests/server-side/com/vaadin/tests/server/PropertysetItemListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java b/server/tests/src/com/vaadin/tests/server/SourceFileChecker.java
index f02e5d2932..1ab742427d 100644
--- a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
+++ b/server/tests/src/com/vaadin/tests/server/SourceFileChecker.java
@@ -188,7 +188,7 @@ public class SourceFileChecker extends TestCase {
 
     class GwtEntryChecker extends FileContentsValidator {
         // Matches e.g.
-        // @com.vaadin.terminal.gwt.client.HistoryImplIEVaadin::escapeHtml(
+        // @com.vaadin.client.HistoryImplIEVaadin::escapeHtml(
         private final Matcher matcher = Pattern.compile("@[\\w.]+::\\w+\\(")
                 .matcher("");
 
diff --git a/tests/server-side/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java b/server/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
index 0d8433d1c6..0d8433d1c6 100644
--- a/tests/server-side/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestAbstractContainerListeners.java b/server/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java
index b63e4f809a..b63e4f809a 100644
--- a/tests/server-side/com/vaadin/tests/server/TestAbstractContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java b/server/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
index a8e2a4aa2a..a8e2a4aa2a 100644
--- a/tests/server-side/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestAbstractPropertyListeners.java b/server/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java
index a1d01d1930..a1d01d1930 100644
--- a/tests/server-side/com/vaadin/tests/server/TestAbstractPropertyListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
index 44a6a3b66d..e98be99cbc 100644
--- a/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java
+++ b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
@@ -31,8 +31,8 @@ public class TestClassesSerializable extends TestCase {
             "com\\.vaadin\\.demo\\..*", //
             "com\\.vaadin\\.external\\.org\\.apache\\.commons\\.fileupload\\..*", //
             "com\\.vaadin\\.launcher\\..*", //
-            "com\\.vaadin\\.terminal\\.gwt\\.client\\..*", //
-            "com\\.vaadin\\.terminal\\.gwt\\.widgetsetutils\\..*", //
+            "com\\.vaadin\\.client\\..*", //
+            "com\\.vaadin\\.server\\.widgetsetutils\\..*", //
             "com\\.vaadin\\.tests\\..*", // exclude automated tests
             "com\\.vaadin\\.tools\\..*", //
             "com\\.vaadin\\.ui\\.themes\\..*", //
@@ -40,15 +40,15 @@ public class TestClassesSerializable extends TestCase {
             "com\\.vaadin\\.event\\.FieldEvents", //
             "com\\.vaadin\\.event\\.LayoutEvents", //
             "com\\.vaadin\\.event\\.MouseEvents", //
-            "com\\.vaadin\\.terminal\\.gwt\\.server\\.AbstractApplicationPortlet", //
-            "com\\.vaadin\\.terminal\\.gwt\\.server\\.ApplicationPortlet2", //
-            "com\\.vaadin\\.terminal\\.gwt\\.server\\.Constants", //
+            "com\\.vaadin\\.server\\.AbstractApplicationPortlet", //
+            "com\\.vaadin\\.server\\.ApplicationPortlet2", //
+            "com\\.vaadin\\.server\\.Constants", //
             "com\\.vaadin\\.util\\.SerializerHelper", // fully static
             // class level filtering, also affecting nested classes and
             // interfaces
-            "com\\.vaadin\\.terminal\\.gwt\\.server\\.AbstractCommunicationManager.*", //
-            "com\\.vaadin\\.terminal\\.gwt\\.server\\.CommunicationManager.*", //
-            "com\\.vaadin\\.terminal\\.gwt\\.server\\.PortletCommunicationManager.*", //
+            "com\\.vaadin\\.server\\.AbstractCommunicationManager.*", //
+            "com\\.vaadin\\.server\\.CommunicationManager.*", //
+            "com\\.vaadin\\.server\\.PortletCommunicationManager.*", //
     };
 
     /**
diff --git a/tests/server-side/com/vaadin/tests/server/TestEventRouter.java b/server/tests/src/com/vaadin/tests/server/TestEventRouter.java
index a8f5039042..a8f5039042 100644
--- a/tests/server-side/com/vaadin/tests/server/TestEventRouter.java
+++ b/server/tests/src/com/vaadin/tests/server/TestEventRouter.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestFileTypeResolver.java b/server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java
index 8a368ead53..8a368ead53 100644
--- a/tests/server-side/com/vaadin/tests/server/TestFileTypeResolver.java
+++ b/server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java b/server/tests/src/com/vaadin/tests/server/TestKeyMapper.java
index 4f5f0b1431..1c1f9624c8 100644
--- a/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java
+++ b/server/tests/src/com/vaadin/tests/server/TestKeyMapper.java
@@ -5,7 +5,7 @@ import java.util.HashMap;
 
 import junit.framework.TestCase;
 
-import com.vaadin.terminal.KeyMapper;
+import com.vaadin.server.KeyMapper;
 
 public class TestKeyMapper extends TestCase {
 
diff --git a/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java b/server/tests/src/com/vaadin/tests/server/TestMimeTypes.java
index 8231030666..dc730f6cc4 100644
--- a/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java
+++ b/server/tests/src/com/vaadin/tests/server/TestMimeTypes.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.server;
 import junit.framework.TestCase;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ClassResource;
+import com.vaadin.server.ClassResource;
 import com.vaadin.ui.Embedded;
 
 public class TestMimeTypes extends TestCase {
@@ -17,10 +17,10 @@ public class TestMimeTypes extends TestCase {
 
             }
         };
-        Embedded e = new Embedded("A pdf", new ClassResource("file.pddf", app));
+        Embedded e = new Embedded("A pdf", new ClassResource("file.pddf"));
         assertEquals("Invalid mimetype", "application/octet-stream",
                 e.getMimeType());
-        e = new Embedded("A pdf", new ClassResource("file.pdf", app));
+        e = new Embedded("A pdf", new ClassResource("file.pdf"));
         assertEquals("Invalid mimetype", "application/pdf", e.getMimeType());
     }
 }
diff --git a/tests/server-side/com/vaadin/tests/server/TestPropertyFormatter.java b/server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java
index 48c60c83c4..48c60c83c4 100644
--- a/tests/server-side/com/vaadin/tests/server/TestPropertyFormatter.java
+++ b/server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestSerialization.java b/server/tests/src/com/vaadin/tests/server/TestSerialization.java
index 84ff5ad6fa..84ff5ad6fa 100644
--- a/tests/server-side/com/vaadin/tests/server/TestSerialization.java
+++ b/server/tests/src/com/vaadin/tests/server/TestSerialization.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java b/server/tests/src/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
index 65455eba37..84247c81c1 100644
--- a/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
+++ b/server/tests/src/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
 
 import junit.framework.TestCase;
 
-import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.SimpleMultiPartInputStream;
+import com.vaadin.server.AbstractCommunicationManager.SimpleMultiPartInputStream;
 
 public class TestSimpleMultiPartInputStream extends TestCase {
 
diff --git a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java b/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java
index 5ea4bc52c4..f3b367483a 100644
--- a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java
+++ b/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java
@@ -5,9 +5,9 @@ import junit.framework.TestCase;
 import org.easymock.EasyMock;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.StreamVariable;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.gwt.server.CommunicationManager;
+import com.vaadin.server.CommunicationManager;
+import com.vaadin.server.StreamVariable;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.Upload;
 
diff --git a/tests/server-side/com/vaadin/tests/server/TestThemeNames.java b/server/tests/src/com/vaadin/tests/server/TestThemeNames.java
index 22fe315730..22fe315730 100644
--- a/tests/server-side/com/vaadin/tests/server/TestThemeNames.java
+++ b/server/tests/src/com/vaadin/tests/server/TestThemeNames.java
diff --git a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java b/server/tests/src/com/vaadin/tests/server/TransactionListenersConcurrency.java
index f7ac55b6da..0cacccd08a 100644
--- a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
+++ b/server/tests/src/com/vaadin/tests/server/TransactionListenersConcurrency.java
@@ -19,10 +19,10 @@ import junit.framework.TestCase;
 
 import com.vaadin.Application;
 import com.vaadin.Application.ApplicationStartEvent;
+import com.vaadin.server.AbstractWebApplicationContext;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.WebApplicationContext;
 import com.vaadin.service.ApplicationContext.TransactionListener;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
 
 import org.easymock.EasyMock;
 
diff --git a/tests/server-side/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java b/server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
index e189ffc77d..e189ffc77d 100644
--- a/tests/server-side/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/FinalMethodTest.java b/server/tests/src/com/vaadin/tests/server/component/FinalMethodTest.java
index ad80007882..ad80007882 100644
--- a/tests/server-side/com/vaadin/tests/server/component/FinalMethodTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/FinalMethodTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
index 7d6db42d1a..7d6db42d1a 100644
--- a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
index 4458872c79..d76dcffa2f 100644
--- a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
+++ b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.server.component.absolutelayout;
 
 import junit.framework.TestCase;
 
-import com.vaadin.terminal.Sizeable;
-import com.vaadin.terminal.Sizeable.Unit;
+import com.vaadin.server.Sizeable;
+import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.Button;
 
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java
index 1903e66f92..1903e66f92 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
index f9f170eb2a..f9f170eb2a 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
index 57af748247..57af748247 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java
index 25430fc9a5..25430fc9a5 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
index 3a251ecbb9..5dbab8467e 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
@@ -8,7 +8,7 @@ import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.AbstractProperty;
 import com.vaadin.data.util.converter.Converter.ConversionException;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.UI;
 
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
index 9937bf92d5..9937bf92d5 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
index 1971fb6d0e..1971fb6d0e 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
index a0b34aca78..a0b34aca78 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
index 75c19b0517..75c19b0517 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
index 2b6cdaa6cc..2b6cdaa6cc 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
index 9868d6ebfd..9868d6ebfd 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/button/ButtonClick.java b/server/tests/src/com/vaadin/tests/server/component/button/ButtonClick.java
index 4fe499a0a0..4fe499a0a0 100644
--- a/tests/server-side/com/vaadin/tests/server/component/button/ButtonClick.java
+++ b/server/tests/src/com/vaadin/tests/server/component/button/ButtonClick.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/button/ButtonListeners.java b/server/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java
index dc37312eea..dc37312eea 100644
--- a/tests/server-side/com/vaadin/tests/server/component/button/ButtonListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java b/server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
index c0d739b597..c0d739b597 100644
--- a/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
index 21a48888d6..21a48888d6 100644
--- a/tests/server-side/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/datefield/DateFieldListeners.java b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
index 0f4aee35c7..0f4aee35c7 100644
--- a/tests/server-side/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/datefield/ResolutionTest.java b/server/tests/src/com/vaadin/tests/server/component/datefield/ResolutionTest.java
index 00b5c60dad..00b5c60dad 100644
--- a/tests/server-side/com/vaadin/tests/server/component/datefield/ResolutionTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/datefield/ResolutionTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java b/server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
index 7512f0f499..7512f0f499 100644
--- a/tests/server-side/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
index ce3a9faa65..ce3a9faa65 100644
--- a/tests/server-side/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java b/server/tests/src/com/vaadin/tests/server/component/label/LabelConverters.java
index 48279c7c88..48279c7c88 100644
--- a/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java
+++ b/server/tests/src/com/vaadin/tests/server/component/label/LabelConverters.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/label/LabelListeners.java b/server/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java
index 3ed79f5010..3ed79f5010 100644
--- a/tests/server-side/com/vaadin/tests/server/component/label/LabelListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/loginform/LoginFormListeners.java b/server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
index fd3e02994c..fd3e02994c 100644
--- a/tests/server-side/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/menubar/MenuBarIds.java b/server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIds.java
index f304315ebc..f304315ebc 100644
--- a/tests/server-side/com/vaadin/tests/server/component/menubar/MenuBarIds.java
+++ b/server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIds.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java b/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
index 7eb35c3882..7eb35c3882 100644
--- a/tests/server-side/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java b/server/tests/src/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java
index 6a9d55d7e4..6a9d55d7e4 100644
--- a/tests/server-side/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java
+++ b/server/tests/src/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/panel/PanelListeners.java b/server/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java
index 275e90f5d1..275e90f5d1 100644
--- a/tests/server-side/com/vaadin/tests/server/component/panel/PanelListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/popupview/PopupViewListeners.java b/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
index 12a5a0f520..12a5a0f520 100644
--- a/tests/server-side/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
index 9b4d9492a2..906d6ccebd 100644
--- a/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
+++ b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
@@ -11,9 +11,9 @@ import org.easymock.EasyMock;
 import com.vaadin.Application;
 import com.vaadin.Application.ApplicationStartEvent;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.terminal.DefaultUIProvider;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.DefaultUIProvider;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 public class CustomUIClassLoader extends TestCase {
diff --git a/tests/server-side/com/vaadin/tests/server/component/select/SelectListeners.java b/server/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
index c7703303d3..c7703303d3 100644
--- a/tests/server-side/com/vaadin/tests/server/component/select/SelectListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/slider/SliderTest.java b/server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java
index b969bf5e53..b969bf5e53 100644
--- a/tests/server-side/com/vaadin/tests/server/component/slider/SliderTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TableColumnAlignments.java b/server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignments.java
index 299f9c79d4..299f9c79d4 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TableColumnAlignments.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignments.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TableGenerator.java b/server/tests/src/com/vaadin/tests/server/component/table/TableGenerator.java
index 0e63049944..0e63049944 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TableGenerator.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableGenerator.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TableListeners.java b/server/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
index 6cc522f8c7..6cc522f8c7 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TableListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TableSerialization.java b/server/tests/src/com/vaadin/tests/server/component/table/TableSerialization.java
index ee6349093c..ee6349093c 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TableSerialization.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableSerialization.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TableVisibleColumns.java b/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java
index be312044db..be312044db 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TableVisibleColumns.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TestFooter.java b/server/tests/src/com/vaadin/tests/server/component/table/TestFooter.java
index 647d13855b..647d13855b 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TestFooter.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TestFooter.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TestMultipleSelection.java b/server/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java
index 767b651b68..767b651b68 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TestMultipleSelection.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
index 5c01a1c99f..5c01a1c99f 100644
--- a/tests/server-side/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
index 0ef8ae5a76..0ef8ae5a76 100644
--- a/tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java b/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java
index 4bb0177a18..4bb0177a18 100644
--- a/tests/server-side/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java
+++ b/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/tree/TestHasChildren.java b/server/tests/src/com/vaadin/tests/server/component/tree/TestHasChildren.java
index 66535d3ffb..66535d3ffb 100644
--- a/tests/server-side/com/vaadin/tests/server/component/tree/TestHasChildren.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tree/TestHasChildren.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/tree/TestListeners.java b/server/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java
index 4984cf161b..4984cf161b 100644
--- a/tests/server-side/com/vaadin/tests/server/component/tree/TestListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/tree/TreeListeners.java b/server/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
index e14ebe739d..e14ebe739d 100644
--- a/tests/server-side/com/vaadin/tests/server/component/tree/TreeListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java b/server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java
index 535ed8e860..535ed8e860 100644
--- a/tests/server-side/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java
+++ b/server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java b/server/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java
index c9ce0ac0a2..265e5382d4 100644
--- a/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.server.component.upload;
 
-import com.vaadin.terminal.StreamVariable.StreamingProgressEvent;
+import com.vaadin.server.StreamVariable.StreamingProgressEvent;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.Upload.FailedEvent;
diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
index 88bc28bbc8..88bc28bbc8 100644
--- a/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java
index 2a0a733140..0fb0765c9f 100644
--- a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java
@@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
diff --git a/tests/server-side/com/vaadin/tests/server/component/window/WindowListeners.java b/server/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java
index c33871cbd8..c33871cbd8 100644
--- a/tests/server-side/com/vaadin/tests/server/component/window/WindowListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java
index e3e743d02a..e3e743d02a 100644
--- a/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
index 828404bd5a..828404bd5a 100644
--- a/tests/server-side/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
index dc9667c38e..dc9667c38e 100644
--- a/tests/server-side/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
index 71a813d423..71a813d423 100644
--- a/tests/server-side/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
index 0e3a1d5734..0e3a1d5734 100644
--- a/tests/server-side/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java b/server/tests/src/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java
index f2de4f3c04..f2de4f3c04 100644
--- a/tests/server-side/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java
+++ b/server/tests/src/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java b/server/tests/src/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
index 3ba1c4c7f1..3ba1c4c7f1 100644
--- a/tests/server-side/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
+++ b/server/tests/src/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/TestComboBoxValueChange.java b/server/tests/src/com/vaadin/tests/server/components/TestComboBoxValueChange.java
index 308889fa33..308889fa33 100644
--- a/tests/server-side/com/vaadin/tests/server/components/TestComboBoxValueChange.java
+++ b/server/tests/src/com/vaadin/tests/server/components/TestComboBoxValueChange.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java b/server/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
index 92664917fd..92664917fd 100644
--- a/tests/server-side/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
+++ b/server/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java b/server/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java
index de838e339c..de838e339c 100644
--- a/tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java
+++ b/server/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/TestWindow.java b/server/tests/src/com/vaadin/tests/server/components/TestWindow.java
index 12d3a3c8f5..12d3a3c8f5 100644
--- a/tests/server-side/com/vaadin/tests/server/components/TestWindow.java
+++ b/server/tests/src/com/vaadin/tests/server/components/TestWindow.java
diff --git a/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java b/server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
index 5db0df4280..5db0df4280 100644
--- a/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
index 6dfc44540c..595ddb95db 100644
--- a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
@@ -181,14 +181,14 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getViewName("test1")).andReturn("test1");
         EasyMock.expect(provider.getView("test1")).andReturn(view1);
         EasyMock.expect(manager.getFragment()).andReturn("");
-        view1.navigateTo(null);
+        view1.navigateTo("");
         display.showView(view1);
         manager.setFragment("test1");
 
         EasyMock.expect(provider.getViewName("test2/")).andReturn("test2");
         EasyMock.expect(provider.getView("test2")).andReturn(view2);
         EasyMock.expect(manager.getFragment()).andReturn("view1");
-        view2.navigateTo(null);
+        view2.navigateTo("");
         display.showView(view2);
         manager.setFragment("test2");
 
@@ -223,14 +223,14 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getViewName("test2")).andReturn("test2");
         EasyMock.expect(provider.getView("test2")).andReturn(view2);
         EasyMock.expect(manager.getFragment()).andReturn("view1");
-        view2.navigateTo(null);
+        view2.navigateTo("");
         display.showView(view2);
         manager.setFragment("test2");
 
         EasyMock.expect(provider.getViewName("")).andReturn("test1");
         EasyMock.expect(provider.getView("test1")).andReturn(view1);
         EasyMock.expect(manager.getFragment()).andReturn("");
-        view1.navigateTo(null);
+        view1.navigateTo("");
         display.showView(view1);
         manager.setFragment("test1");
 
@@ -269,10 +269,10 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getViewName("test1")).andReturn("test1");
         EasyMock.expect(provider.getView("test1")).andReturn(view1);
         ViewChangeEvent event1 = new ViewChangeEvent(navigator, null, view1,
-                "test1", null);
+                "test1", "");
         listener.addExpectedIsViewChangeAllowed(event1, true);
         EasyMock.expect(manager.getFragment()).andReturn("");
-        view1.navigateTo(null);
+        view1.navigateTo("");
         display.showView(view1);
         manager.setFragment("test1");
         listener.addExpectedNavigatorViewChange(event1);
@@ -280,10 +280,10 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getViewName("test2")).andReturn("test2");
         EasyMock.expect(provider.getView("test2")).andReturn(view2);
         ViewChangeEvent event2 = new ViewChangeEvent(navigator, view1, view2,
-                "test2", null);
+                "test2", "");
         listener.addExpectedIsViewChangeAllowed(event2, true);
         EasyMock.expect(manager.getFragment()).andReturn("view1");
-        view2.navigateTo(null);
+        view2.navigateTo("");
         display.showView(view2);
         manager.setFragment("test2");
         listener.addExpectedNavigatorViewChange(event2);
@@ -320,7 +320,7 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getView("test1")).andReturn(view1);
         EasyMock.expect(manager.getFragment()).andReturn("");
         ViewChangeEvent event1 = new ViewChangeEvent(navigator, null, view1,
-                "test1", null);
+                "test1", "");
         listener1.addExpectedIsViewChangeAllowed(event1, false);
 
         // second listener blocks second view change
@@ -351,10 +351,10 @@ public class NavigatorTest extends TestCase {
         EasyMock.expect(provider.getView("test2")).andReturn(view2);
         EasyMock.expect(manager.getFragment()).andReturn("view1");
         ViewChangeEvent event4 = new ViewChangeEvent(navigator, view1, view2,
-                "test2", null);
+                "test2", "");
         listener1.addExpectedIsViewChangeAllowed(event4, true);
         listener2.addExpectedIsViewChangeAllowed(event4, true);
-        view2.navigateTo(null);
+        view2.navigateTo("");
         display.showView(view2);
         manager.setFragment("test2");
         listener1.addExpectedNavigatorViewChange(event4);
diff --git a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
index e342ee9005..18ed52cc2a 100644
--- a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
@@ -23,8 +23,8 @@ import org.easymock.IMocksControl;
 
 import com.vaadin.navigator.Navigator;
 import com.vaadin.navigator.Navigator.UriFragmentManager;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Page.FragmentChangedEvent;
+import com.vaadin.server.Page;
+import com.vaadin.server.Page.FragmentChangedEvent;
 
 public class UriFragmentManagerTest extends TestCase {
 
diff --git a/tests/server-side/com/vaadin/tests/server/validation/RangeValidatorTest.java b/server/tests/src/com/vaadin/tests/server/validation/RangeValidatorTest.java
index e3320b8699..e3320b8699 100644
--- a/tests/server-side/com/vaadin/tests/server/validation/RangeValidatorTest.java
+++ b/server/tests/src/com/vaadin/tests/server/validation/RangeValidatorTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/validation/TestBeanValidation.java b/server/tests/src/com/vaadin/tests/server/validation/TestBeanValidation.java
index 8f6928fc35..8f6928fc35 100644
--- a/tests/server-side/com/vaadin/tests/server/validation/TestBeanValidation.java
+++ b/server/tests/src/com/vaadin/tests/server/validation/TestBeanValidation.java
diff --git a/tests/server-side/com/vaadin/tests/server/validation/TestReadOnlyValidation.java b/server/tests/src/com/vaadin/tests/server/validation/TestReadOnlyValidation.java
index e37b97e02c..e37b97e02c 100644
--- a/tests/server-side/com/vaadin/tests/server/validation/TestReadOnlyValidation.java
+++ b/server/tests/src/com/vaadin/tests/server/validation/TestReadOnlyValidation.java
diff --git a/tests/server-side/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java b/server/tests/src/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java
index 9e791500b0..9e791500b0 100644
--- a/tests/server-side/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java
+++ b/server/tests/src/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java
diff --git a/tests/server-side/com/vaadin/tests/util/TestUtil.java b/server/tests/src/com/vaadin/tests/util/TestUtil.java
index e84f9dd8b9..e84f9dd8b9 100644
--- a/tests/server-side/com/vaadin/tests/util/TestUtil.java
+++ b/server/tests/src/com/vaadin/tests/util/TestUtil.java
diff --git a/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java b/server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java
index d62f0df332..d62f0df332 100644
--- a/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java
+++ b/server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java
diff --git a/shared/src/com/vaadin/shared/AbstractFieldState.java b/shared/src/com/vaadin/shared/AbstractFieldState.java
index 0389507f6c..02cbd16a6f 100644
--- a/shared/src/com/vaadin/shared/AbstractFieldState.java
+++ b/shared/src/com/vaadin/shared/AbstractFieldState.java
@@ -131,7 +131,7 @@ public class AbstractFieldState extends ComponentState implements TabIndexState
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.ComponentState#getTabIndex()
+     * @see com.vaadin.client.ComponentState#getTabIndex()
      */
     @Override
     public int getTabIndex() {
@@ -141,7 +141,7 @@ public class AbstractFieldState extends ComponentState implements TabIndexState
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.ui.TabIndexState#setTabIndex(int)
+     * @see com.vaadin.client.ui.TabIndexState#setTabIndex(int)
      */
     @Override
     public void setTabIndex(int tabIndex) {
diff --git a/shared/src/com/vaadin/shared/ComponentConstants.java b/shared/src/com/vaadin/shared/ComponentConstants.java
new file mode 100644
index 0000000000..6fea3f2dfd
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ComponentConstants.java
@@ -0,0 +1,21 @@
+/*
+ * 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.shared;
+
+public class ComponentConstants {
+    public static final String ICON_RESOURCE = "icon";
+}
diff --git a/shared/src/com/vaadin/shared/ComponentState.java b/shared/src/com/vaadin/shared/ComponentState.java
index 41bddd4666..06330a8604 100644
--- a/shared/src/com/vaadin/shared/ComponentState.java
+++ b/shared/src/com/vaadin/shared/ComponentState.java
@@ -21,7 +21,6 @@ import java.util.List;
 import java.util.Set;
 
 import com.vaadin.shared.communication.SharedState;
-import com.vaadin.shared.communication.URLReference;
 
 /**
  * Default shared state implementation for UI components.
@@ -40,7 +39,6 @@ public class ComponentState extends SharedState {
     // string!
     private String caption = null;
     private boolean visible = true;
-    private URLReference icon = null;
     private List<String> styles = null;
     private String id = null;
     /**
@@ -175,7 +173,7 @@ public class ComponentState extends SharedState {
     /**
      * Returns true if the component is in immediate mode.
      * 
-     * @see com.vaadin.terminal.VariableOwner#isImmediate()
+     * @see com.vaadin.server.VariableOwner#isImmediate()
      * 
      * @return true if the component is in immediate mode
      */
@@ -186,7 +184,7 @@ public class ComponentState extends SharedState {
     /**
      * Sets or resets the immediate mode for a component.
      * 
-     * @see com.vaadin.terminal.VariableOwner#setImmediate()
+     * @see com.vaadin.server.VariableOwner#setImmediate()
      * 
      * @param immediate
      *            new mode for the component
@@ -285,14 +283,6 @@ public class ComponentState extends SharedState {
         this.visible = visible;
     }
 
-    public URLReference getIcon() {
-        return icon;
-    }
-
-    public void setIcon(URLReference icon) {
-        this.icon = icon;
-    }
-
     /**
      * Gets the style names for the component.
      * 
diff --git a/shared/src/com/vaadin/shared/Connector.java b/shared/src/com/vaadin/shared/Connector.java
index 5927d08d79..f3d5d16e59 100644
--- a/shared/src/com/vaadin/shared/Connector.java
+++ b/shared/src/com/vaadin/shared/Connector.java
@@ -29,9 +29,8 @@ import java.io.Serializable;
  * <p>
  * No classes should implement this interface directly, client side classes
  * wanting to communicate with server side should implement
- * {@link com.vaadin.terminal.gwt.client.ServerConnector} and server side
- * classes should implement
- * {@link com.vaadin.terminal.gwt.server.ClientConnector}.
+ * {@link com.vaadin.client.ServerConnector} and server side classes should
+ * implement {@link com.vaadin.server.ClientConnector}.
  * </p>
  * 
  * @author Vaadin Ltd
diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java
index 2e81fbfe61..2143e884c0 100644
--- a/shared/src/com/vaadin/shared/VBrowserDetails.java
+++ b/shared/src/com/vaadin/shared/VBrowserDetails.java
@@ -20,9 +20,8 @@ import java.io.Serializable;
 /**
  * Class that parses the user agent string from the browser and provides
  * information about the browser. Used internally by
- * {@link com.vaadin.terminal.gwt.client.BrowserInfo} and
- * {@link com.vaadin.terminal.gwt.server.WebBrowser}. Should not be used
- * directly.
+ * {@link com.vaadin.client.BrowserInfo} and
+ * {@link com.vaadin.server.WebBrowser}. Should not be used directly.
  * 
  * @author Vaadin Ltd.
  * @since 6.3
diff --git a/shared/src/com/vaadin/shared/communication/SharedState.java b/shared/src/com/vaadin/shared/communication/SharedState.java
index 841e4579a2..09147ac97d 100644
--- a/shared/src/com/vaadin/shared/communication/SharedState.java
+++ b/shared/src/com/vaadin/shared/communication/SharedState.java
@@ -17,6 +17,8 @@
 package com.vaadin.shared.communication;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
 
 import com.vaadin.shared.Connector;
 
@@ -36,9 +38,9 @@ import com.vaadin.shared.Connector;
  * arrays of these.
  * 
  * On the client side the connector should override
- * {@link com.vaadin.terminal.gwt.client.ui.AbstractConnector#getState()} to
- * return the correct state type. This automatically causes a correct state
- * object to be created.
+ * {@link com.vaadin.client.ui.AbstractConnector#getState()} to return the
+ * correct state type. This automatically causes a correct state object to be
+ * created.
  * 
  * Subclasses of a {@link Connector} using shared state should also provide a
  * subclass of the shared state class of the parent class to extend the state. A
@@ -48,6 +50,15 @@ import com.vaadin.shared.Connector;
  */
 public class SharedState implements Serializable {
 
+    /**
+     * The automatically managed resources used by the connector.
+     * 
+     * @see com.vaadin.terminal.AbstractClientConnector#setResource(String,
+     *      com.vaadin.terminal.Resource)
+     * @see com.vaadin.terminal.gwt.client.ui.AbstractConnector#getResourceUrl(String)
+     */
+    public Map<String, URLReference> resources = new HashMap<String, URLReference>();
+
     private boolean enabled = true;
 
     /**
diff --git a/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java b/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java
index 96b785edd0..6422b643ad 100644
--- a/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java
+++ b/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java
@@ -1,20 +1,12 @@
 package com.vaadin.shared.ui;
 
 import com.vaadin.shared.ComponentState;
-import com.vaadin.shared.communication.URLReference;
 
 public class AbstractEmbeddedState extends ComponentState {
 
-    protected URLReference source;
-    protected String alternateText;
+    public static final String SOURCE_RESOURCE = "source";
 
-    public URLReference getSource() {
-        return source;
-    }
-
-    public void setSource(URLReference source) {
-        this.source = source;
-    }
+    private String alternateText;
 
     public String getAlternateText() {
         return alternateText;
diff --git a/shared/src/com/vaadin/shared/ui/Connect.java b/shared/src/com/vaadin/shared/ui/Connect.java
index d54374a0ec..c7a55775bd 100644
--- a/shared/src/com/vaadin/shared/ui/Connect.java
+++ b/shared/src/com/vaadin/shared/ui/Connect.java
@@ -25,7 +25,7 @@ import com.vaadin.shared.Connector;
 /**
  * Annotation defining the server side connector that this ClientSideConnector
  * should connect to. The value must always by a class extending
- * {@link com.vaadin.terminal.gwt.server.ClientConnector}.
+ * {@link com.vaadin.server.ClientConnector}.
  * <p>
  * With this annotation client side Vaadin connector is marked to have a server
  * side counterpart. The value of the annotation is the class of server side
@@ -46,9 +46,8 @@ public @interface Connect {
      * Depending on the used WidgetMap generator, these optional hints may be
      * used to define how the client side components are loaded by the browser.
      * The default is to eagerly load all widgets
-     * {@link com.vaadin.terminal.gwt.widgetsetutils.EagerWidgetMapGenerator},
-     * but if the
-     * {@link com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator} is used
+     * {@link com.vaadin.server.widgetsetutils.EagerWidgetMapGenerator}, but if
+     * the {@link com.vaadin.server.widgetsetutils.WidgetMapGenerator} is used
      * by the widgetset, these load style hints are respected.
      * <p>
      * Lazy loading of a widget implementation means the client side component
@@ -69,15 +68,14 @@ public @interface Connect {
      * the best of both worlds.
      * <p>
      * Fine tunings to widget loading can also be made by overriding
-     * {@link com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator} in the
-     * GWT module. Tunings might be helpful if the end users have slow
-     * connections and especially if they have high latency in their network.
-     * The
-     * {@link com.vaadin.terminal.gwt.widgetsetutils.CustomWidgetMapGenerator}
-     * is an abstract generator implementation for easy customization. Vaadin
-     * package also includes
-     * {@link com.vaadin.terminal.gwt.widgetsetutils.LazyWidgetMapGenerator}
-     * that makes as many widgets lazily loaded as possible.
+     * {@link com.vaadin.server.widgetsetutils.WidgetMapGenerator} in the GWT
+     * module. Tunings might be helpful if the end users have slow connections
+     * and especially if they have high latency in their network. The
+     * {@link com.vaadin.server.widgetsetutils.CustomWidgetMapGenerator} is an
+     * abstract generator implementation for easy customization. Vaadin package
+     * also includes
+     * {@link com.vaadin.server.widgetsetutils.LazyWidgetMapGenerator} that
+     * makes as many widgets lazily loaded as possible.
      * 
      * @since 6.4
      * 
diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonState.java b/shared/src/com/vaadin/shared/ui/button/ButtonState.java
index 7e76f5d1e8..2383b038bd 100644
--- a/shared/src/com/vaadin/shared/ui/button/ButtonState.java
+++ b/shared/src/com/vaadin/shared/ui/button/ButtonState.java
@@ -114,7 +114,7 @@ public class ButtonState extends ComponentState implements TabIndexState {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.ui.TabIndexState#getTabIndex()
+     * @see com.vaadin.client.ui.TabIndexState#getTabIndex()
      */
     @Override
     public int getTabIndex() {
@@ -124,7 +124,7 @@ public class ButtonState extends ComponentState implements TabIndexState {
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.gwt.client.ui.TabIndexState#setTabIndex(int)
+     * @see com.vaadin.client.ui.TabIndexState#setTabIndex(int)
      */
     @Override
     public void setTabIndex(int tabIndex) {
diff --git a/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java b/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java
index e53f75e552..d0805e453e 100644
--- a/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java
+++ b/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Target;
 
 /**
  * An annotation type used to point the server side counterpart for client side
- * a {@link com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion} class.
+ * a {@link com.vaadin.client.ui.dd.VAcceptCriterion} class.
  * <p>
  * Annotations are used at GWT compilation phase, so remember to rebuild your
  * widgetset if you do changes for {@link AcceptCriterion} mappings.
diff --git a/shared/src/com/vaadin/shared/ui/link/LinkConstants.java b/shared/src/com/vaadin/shared/ui/link/LinkConstants.java
new file mode 100644
index 0000000000..dd6079167e
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/link/LinkConstants.java
@@ -0,0 +1,23 @@
+/*
+ * 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.shared.ui.link;
+
+import com.vaadin.shared.ComponentState;
+
+public class LinkConstants {
+    public static String HREF_RESOURCE = "href";
+}
diff --git a/shared/src/com/vaadin/shared/ui/video/VideoConstants.java b/shared/src/com/vaadin/shared/ui/video/VideoConstants.java
new file mode 100644
index 0000000000..951495b6af
--- /dev/null
+++ b/shared/src/com/vaadin/shared/ui/video/VideoConstants.java
@@ -0,0 +1,21 @@
+/*
+ * 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.shared.ui.video;
+
+public class VideoConstants {
+    public static final String POSTER_RESOURCE = "poster";
+}
diff --git a/shared/src/com/vaadin/shared/ui/video/VideoState.java b/shared/src/com/vaadin/shared/ui/video/VideoState.java
index 695d495e16..2e6e24a743 100644
--- a/shared/src/com/vaadin/shared/ui/video/VideoState.java
+++ b/shared/src/com/vaadin/shared/ui/video/VideoState.java
@@ -15,18 +15,8 @@
  */
 package com.vaadin.shared.ui.video;
 
-import com.vaadin.shared.communication.URLReference;
 import com.vaadin.shared.ui.AbstractMediaState;
 
 public class VideoState extends AbstractMediaState {
-    private URLReference poster;
-
-    public URLReference getPoster() {
-        return poster;
-    }
-
-    public void setPoster(URLReference poster) {
-        this.poster = poster;
-    }
 
 }
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
index d235086ca9..bacfc62b40 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
@@ -8,10 +8,10 @@ import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
-import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractField;
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
index 961ec86ab0..64eea46b64 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.orderedlayout;
 
 import com.vaadin.Application.LegacyApplication;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
index 5ebb702baf..a14f37f95e 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
+++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.orderedlayout;
 
 import com.vaadin.annotations.Theme;
+import com.vaadin.server.Sizeable;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.slider.SliderOrientation;
-import com.vaadin.terminal.Sizeable;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectTest.java b/tests/testbench/com/vaadin/tests/components/select/SelectTest.java
deleted file mode 100644
index efea508681..0000000000
--- a/tests/testbench/com/vaadin/tests/components/select/SelectTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.vaadin.tests.components.select;
-
-import com.vaadin.ui.Select;
-
-public class SelectTest<T extends Select> extends AbstractSelectTestCase<T> {
-
-    @SuppressWarnings("unchecked")
-    @Override
-    protected Class<T> getTestClass() {
-        return (Class<T>) Select.class;
-    }
-
-}
diff --git a/tests/testbench/com/vaadin/tests/integration/SpecialNameResource.java b/tests/testbench/com/vaadin/tests/integration/SpecialNameResource.java
deleted file mode 100644
index b8dd199e3d..0000000000
--- a/tests/testbench/com/vaadin/tests/integration/SpecialNameResource.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.vaadin.tests.integration;
-
-import com.vaadin.Application;
-import com.vaadin.terminal.ClassResource;
-
-public class SpecialNameResource extends ClassResource {
-    public SpecialNameResource(Application application) {
-        super("spe=cial%res&ource.gif", application);
-    }
-}
diff --git a/tests/testbench/com/vaadin/tests/themes/LiferayThemeTest.java b/tests/testbench/com/vaadin/tests/themes/LiferayThemeTest.java
index f956a93cd5..6640134326 100644
--- a/tests/testbench/com/vaadin/tests/themes/LiferayThemeTest.java
+++ b/tests/testbench/com/vaadin/tests/themes/LiferayThemeTest.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.themes;
 
 import com.vaadin.annotations.Theme;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java
deleted file mode 100644
index 69b415625c..0000000000
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.vaadin.tests.widgetset.client.minitutorials.v7a2;
-
-import com.vaadin.shared.ComponentState;
-import com.vaadin.shared.communication.URLReference;
-
-public class ResourceInStateState extends ComponentState {
-
-    private URLReference myIcon;
-
-    public URLReference getMyIcon() {
-        return myIcon;
-    }
-
-    public void setMyIcon(URLReference icon) {
-        myIcon = icon;
-    }
-}
\ No newline at end of file
diff --git a/tests/eclipse-run-selected-test.properties b/uitest/eclipse-run-selected-test.properties
index 49925925bc..49925925bc 100644
--- a/tests/eclipse-run-selected-test.properties
+++ b/uitest/eclipse-run-selected-test.properties
diff --git a/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html b/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
index 4bc3e6a2cf..4bc3e6a2cf 100644
--- a/tests/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
+++ b/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
diff --git a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html b/uitest/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
index 3f5ec1ce90..3f5ec1ce90 100644
--- a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
+++ b/uitest/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
diff --git a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html b/uitest/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
index 55c9d18eb8..55c9d18eb8 100644
--- a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
+++ b/uitest/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
diff --git a/tests/integration-testscripts/Liferay-6/Liferay6-theme.html b/uitest/integration-testscripts/Liferay-6/Liferay6-theme.html
index c61adb0dd7..c61adb0dd7 100644
--- a/tests/integration-testscripts/Liferay-6/Liferay6-theme.html
+++ b/uitest/integration-testscripts/Liferay-6/Liferay6-theme.html
diff --git a/tests/integration-testscripts/Liferay-6/integration-test-liferay-6.0.5.html b/uitest/integration-testscripts/Liferay-6/integration-test-liferay-6.0.5.html
index 88cac6cd74..88cac6cd74 100644
--- a/tests/integration-testscripts/Liferay-6/integration-test-liferay-6.0.5.html
+++ b/uitest/integration-testscripts/Liferay-6/integration-test-liferay-6.0.5.html
diff --git a/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html b/uitest/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html
index f4772ef7ad..f4772ef7ad 100644
--- a/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html
+++ b/uitest/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html
diff --git a/tests/integration-testscripts/Liferay-6EE/integration-test-liferay-6ee.html b/uitest/integration-testscripts/Liferay-6EE/integration-test-liferay-6ee.html
index d4ea24c797..d4ea24c797 100644
--- a/tests/integration-testscripts/Liferay-6EE/integration-test-liferay-6ee.html
+++ b/uitest/integration-testscripts/Liferay-6EE/integration-test-liferay-6ee.html
diff --git a/tests/integration-testscripts/common/integration_test.tpl b/uitest/integration-testscripts/common/integration_test.tpl
index ed97710282..ed97710282 100644
--- a/tests/integration-testscripts/common/integration_test.tpl
+++ b/uitest/integration-testscripts/common/integration_test.tpl
diff --git a/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html b/uitest/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html
index af85dfd161..af85dfd161 100644
--- a/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html
+++ b/uitest/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html
diff --git a/tests/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html b/uitest/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html
index 98256862aa..98256862aa 100644
--- a/tests/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html
+++ b/uitest/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html
diff --git a/tests/integration_base_files/base.xml b/uitest/integration_base_files/base.xml
index f9c2ff3d6b..f9c2ff3d6b 100644
--- a/tests/integration_base_files/base.xml
+++ b/uitest/integration_base_files/base.xml
diff --git a/tests/integration_base_files/cleanup.sh b/uitest/integration_base_files/cleanup.sh
index 42fb5a434d..42fb5a434d 100644
--- a/tests/integration_base_files/cleanup.sh
+++ b/uitest/integration_base_files/cleanup.sh
diff --git a/tests/integration_base_files/lock_age.sh b/uitest/integration_base_files/lock_age.sh
index 115a8fef79..115a8fef79 100644
--- a/tests/integration_base_files/lock_age.sh
+++ b/uitest/integration_base_files/lock_age.sh
diff --git a/tests/integration_tests.xml b/uitest/integration_tests.xml
index e8e978c1ea..e8e978c1ea 100644
--- a/tests/integration_tests.xml
+++ b/uitest/integration_tests.xml
diff --git a/tests/ivy.xml b/uitest/ivy.xml
index 6c7171166b..2b543885c6 100644
--- a/tests/ivy.xml
+++ b/uitest/ivy.xml
@@ -2,7 +2,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd">
     
-    <info organisation="com.vaadin" module="tests"/>
+    <info organisation="com.vaadin" module="vaadin-uitests"/>
     <configurations>
    		<conf name="jetty" visibility="private" />
    		<conf name="emma" visibility="private" />
diff --git a/tests/testbench/META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener b/uitest/src/META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener
index 9b3d9eb082..9b3d9eb082 100644
--- a/tests/testbench/META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener
+++ b/uitest/src/META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener
diff --git a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
index 8183ed2d0b..e05979ede0 100644
--- a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -31,10 +31,10 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.terminal.AbstractUIProvider;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
-import com.vaadin.terminal.gwt.server.WrappedHttpServletRequest;
+import com.vaadin.server.AbstractApplicationServlet;
+import com.vaadin.server.AbstractUIProvider;
+import com.vaadin.server.WrappedHttpServletRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.UI;
 
diff --git a/tests/testbench/com/vaadin/launcher/DemoLauncher.java b/uitest/src/com/vaadin/launcher/DemoLauncher.java
index d858b91483..d858b91483 100644
--- a/tests/testbench/com/vaadin/launcher/DemoLauncher.java
+++ b/uitest/src/com/vaadin/launcher/DemoLauncher.java
diff --git a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index 6162820dac..6162820dac 100644
--- a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
diff --git a/tests/testbench/com/vaadin/launcher/jetty-webdefault.xml b/uitest/src/com/vaadin/launcher/jetty-webdefault.xml
index 5a2465af5a..5a2465af5a 100644
--- a/tests/testbench/com/vaadin/launcher/jetty-webdefault.xml
+++ b/uitest/src/com/vaadin/launcher/jetty-webdefault.xml
diff --git a/tests/testbench/com/vaadin/launcher/keystore b/uitest/src/com/vaadin/launcher/keystore
index 1314185e2a..1314185e2a 100644
--- a/tests/testbench/com/vaadin/launcher/keystore
+++ b/uitest/src/com/vaadin/launcher/keystore
diff --git a/tests/testbench/com/vaadin/launcher/util/BrowserLauncher.java b/uitest/src/com/vaadin/launcher/util/BrowserLauncher.java
index c9b3622894..c9b3622894 100644
--- a/tests/testbench/com/vaadin/launcher/util/BrowserLauncher.java
+++ b/uitest/src/com/vaadin/launcher/util/BrowserLauncher.java
diff --git a/tests/testbench/com/vaadin/tests/Components.java b/uitest/src/com/vaadin/tests/Components.java
index 66e693a1de..5882c5cdb1 100644
--- a/tests/testbench/com/vaadin/tests/Components.java
+++ b/uitest/src/com/vaadin/tests/Components.java
@@ -15,9 +15,9 @@ import com.vaadin.data.util.DefaultItemSorter;
 import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.Sizeable;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.Sizeable;
 import com.vaadin.tests.components.AbstractComponentTest;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java
index 833340f678..833340f678 100644
--- a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java
+++ b/uitest/src/com/vaadin/tests/CustomLayoutDemo.java
diff --git a/tests/testbench/com/vaadin/tests/FocusingComponents.java b/uitest/src/com/vaadin/tests/FocusingComponents.java
index f63989fafb..f63989fafb 100644
--- a/tests/testbench/com/vaadin/tests/FocusingComponents.java
+++ b/uitest/src/com/vaadin/tests/FocusingComponents.java
diff --git a/tests/testbench/com/vaadin/tests/LayoutDemo.java b/uitest/src/com/vaadin/tests/LayoutDemo.java
index 23997ac084..a5331b94af 100644
--- a/tests/testbench/com/vaadin/tests/LayoutDemo.java
+++ b/uitest/src/com/vaadin/tests/LayoutDemo.java
@@ -16,8 +16,8 @@
 
 package com.vaadin.tests;
 
+import com.vaadin.server.ClassResource;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ClassResource;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.GridLayout;
@@ -25,8 +25,8 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.Panel;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
 /**
@@ -121,7 +121,7 @@ public class LayoutDemo extends com.vaadin.Application.LegacyApplication {
 
     private Component getExamplePicture(String caption) {
         // loads image from package com.vaadin.demo
-        final ClassResource cr = new ClassResource("m-bullet-blue.gif", this);
+        final ClassResource cr = new ClassResource("m-bullet-blue.gif");
         final Embedded em = new Embedded("Embedded " + caption, cr);
         em.setWidth("170px");
         return em;
diff --git a/tests/testbench/com/vaadin/tests/ListenerOrder.java b/uitest/src/com/vaadin/tests/ListenerOrder.java
index ab364a8781..ab364a8781 100644
--- a/tests/testbench/com/vaadin/tests/ListenerOrder.java
+++ b/uitest/src/com/vaadin/tests/ListenerOrder.java
diff --git a/tests/testbench/com/vaadin/tests/ModalWindow.java b/uitest/src/com/vaadin/tests/ModalWindow.java
index 6153f14285..6153f14285 100644
--- a/tests/testbench/com/vaadin/tests/ModalWindow.java
+++ b/uitest/src/com/vaadin/tests/ModalWindow.java
diff --git a/tests/testbench/com/vaadin/tests/NativeWindowing.java b/uitest/src/com/vaadin/tests/NativeWindowing.java
index 4bce92b668..2418c74db8 100644
--- a/tests/testbench/com/vaadin/tests/NativeWindowing.java
+++ b/uitest/src/com/vaadin/tests/NativeWindowing.java
@@ -96,7 +96,7 @@ public class NativeWindowing extends Application.LegacyApplication {
                     public void buttonClick(ClickEvent event) {
                         try {
                             main.open(
-                                    new com.vaadin.terminal.ExternalResource(
+                                    new com.vaadin.server.ExternalResource(
                                             new URL(
                                                     getURL(),
                                                     "mainwin-"
diff --git a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java b/uitest/src/com/vaadin/tests/OrderedLayoutSwapComponents.java
index f47078ba8c..f47078ba8c 100644
--- a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java
+++ b/uitest/src/com/vaadin/tests/OrderedLayoutSwapComponents.java
diff --git a/tests/testbench/com/vaadin/tests/Parameters.java b/uitest/src/com/vaadin/tests/Parameters.java
index d6bc9007ed..b16d4ef65b 100644
--- a/tests/testbench/com/vaadin/tests/Parameters.java
+++ b/uitest/src/com/vaadin/tests/Parameters.java
@@ -22,10 +22,10 @@ import java.util.Iterator;
 import java.util.Map;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout.MarginHandler;
 import com.vaadin.ui.Link;
diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/uitest/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
index 5f92484c6c..0e76617cc5 100644
--- a/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
+++ b/uitest/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
@@ -19,8 +19,8 @@ package com.vaadin.tests;
 import java.util.Date;
 import java.util.Map;
 
+import com.vaadin.server.UserError;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.UserError;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.CustomComponent;
diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/uitest/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
index 8002059227..8002059227 100644
--- a/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
+++ b/uitest/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/uitest/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java
index 485843d104..485843d104 100644
--- a/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java
+++ b/uitest/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java
diff --git a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/com/vaadin/tests/RandomLayoutStress.java
index 0161a2a20e..0b6b0cf8ba 100644
--- a/tests/testbench/com/vaadin/tests/RandomLayoutStress.java
+++ b/uitest/src/com/vaadin/tests/RandomLayoutStress.java
@@ -18,7 +18,7 @@ package com.vaadin.tests;
 
 import java.util.Random;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomLayout;
diff --git a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java b/uitest/src/com/vaadin/tests/ScrollbarStressTest.java
index 7436bfc539..7436bfc539 100644
--- a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java
+++ b/uitest/src/com/vaadin/tests/ScrollbarStressTest.java
diff --git a/tests/testbench/com/vaadin/tests/StressComponentsInTable.java b/uitest/src/com/vaadin/tests/StressComponentsInTable.java
index 7c4cca2b0b..7c4cca2b0b 100644
--- a/tests/testbench/com/vaadin/tests/StressComponentsInTable.java
+++ b/uitest/src/com/vaadin/tests/StressComponentsInTable.java
diff --git a/tests/testbench/com/vaadin/tests/TableChangingDatasource.java b/uitest/src/com/vaadin/tests/TableChangingDatasource.java
index e9e23be18d..e9e23be18d 100644
--- a/tests/testbench/com/vaadin/tests/TableChangingDatasource.java
+++ b/uitest/src/com/vaadin/tests/TableChangingDatasource.java
diff --git a/tests/testbench/com/vaadin/tests/TableSelectTest.java b/uitest/src/com/vaadin/tests/TableSelectTest.java
index fd4ce5d5c8..fd4ce5d5c8 100644
--- a/tests/testbench/com/vaadin/tests/TableSelectTest.java
+++ b/uitest/src/com/vaadin/tests/TableSelectTest.java
diff --git a/tests/testbench/com/vaadin/tests/TestBench.java b/uitest/src/com/vaadin/tests/TestBench.java
index 32fff09455..67e1180d75 100644
--- a/tests/testbench/com/vaadin/tests/TestBench.java
+++ b/uitest/src/com/vaadin/tests/TestBench.java
@@ -27,9 +27,9 @@ import java.util.List;
 import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.HierarchicalContainer;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Page.FragmentChangedEvent;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.Page;
+import com.vaadin.server.Page.FragmentChangedEvent;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.HorizontalSplitPanel;
diff --git a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/com/vaadin/tests/TestCaptionWrapper.java
index d5669e5689..b2e09a2a6f 100644
--- a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java
+++ b/uitest/src/com/vaadin/tests/TestCaptionWrapper.java
@@ -16,11 +16,11 @@
 
 package com.vaadin.tests;
 
+import com.vaadin.server.ClassResource;
+import com.vaadin.server.ErrorMessage;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.UserError;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ClassResource;
-import com.vaadin.terminal.ErrorMessage;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.UserError;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
@@ -92,10 +92,8 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
         final VerticalLayout tab2 = new VerticalLayout();
         test(tab2);
         populateLayout(tab2);
-        tabsheet.addTab(tab1, "TabSheet tab1", new ClassResource("m.gif",
-                getApplication()));
-        tabsheet.addTab(tab2, "TabSheet tab2", new ClassResource("m.gif",
-                getApplication()));
+        tabsheet.addTab(tab1, "TabSheet tab1", new ClassResource("m.gif"));
+        tabsheet.addTab(tab2, "TabSheet tab2", new ClassResource("m.gif"));
 
         final VerticalLayout expandLayout = new VerticalLayout();
         test(expandLayout);
@@ -186,7 +184,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
      * @param c
      */
     void test(AbstractComponent c) {
-        final ClassResource res = new ClassResource("m.gif", getApplication());
+        final ClassResource res = new ClassResource("m.gif");
         final ErrorMessage errorMsg = new UserError("User error " + c);
 
         if ((c.getCaption() == null) || (c.getCaption().length() <= 0)) {
diff --git a/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java b/uitest/src/com/vaadin/tests/TestComponentAddAndRecursion.java
index e13b907f77..1a93de387a 100644
--- a/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java
+++ b/uitest/src/com/vaadin/tests/TestComponentAddAndRecursion.java
@@ -3,7 +3,7 @@
  */
 package com.vaadin.tests;
 
-import com.vaadin.terminal.Page;
+import com.vaadin.server.Page;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CustomComponent;
diff --git a/tests/testbench/com/vaadin/tests/TestContainerChanges.java b/uitest/src/com/vaadin/tests/TestContainerChanges.java
index 87251c0d65..87251c0d65 100644
--- a/tests/testbench/com/vaadin/tests/TestContainerChanges.java
+++ b/uitest/src/com/vaadin/tests/TestContainerChanges.java
diff --git a/tests/testbench/com/vaadin/tests/TestDateField.java b/uitest/src/com/vaadin/tests/TestDateField.java
index 6cdeb3ffbd..5854b52b73 100644
--- a/tests/testbench/com/vaadin/tests/TestDateField.java
+++ b/uitest/src/com/vaadin/tests/TestDateField.java
@@ -18,9 +18,9 @@ package com.vaadin.tests;
 
 import java.util.Locale;
 
-import com.vaadin.terminal.ClassResource;
-import com.vaadin.terminal.ErrorMessage;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.ClassResource;
+import com.vaadin.server.ErrorMessage;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.Label;
@@ -77,8 +77,7 @@ public class TestDateField extends CustomComponent {
 
     @Override
     public void attach() {
-        final ClassResource res = new ClassResource("m.gif",
-                super.getApplication());
+        final ClassResource res = new ClassResource("m.gif");
         df.setIcon(res);
         super.attach();
     }
diff --git a/tests/testbench/com/vaadin/tests/TestForAlignments.java b/uitest/src/com/vaadin/tests/TestForAlignments.java
index 130ec89901..130ec89901 100644
--- a/tests/testbench/com/vaadin/tests/TestForAlignments.java
+++ b/uitest/src/com/vaadin/tests/TestForAlignments.java
diff --git a/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index c3fa269fba..c3fa269fba 100644
--- a/tests/testbench/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
diff --git a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java b/uitest/src/com/vaadin/tests/TestForBasicApplicationLayout.java
index 1692c2fe7b..1d28a0a1b4 100644
--- a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java
+++ b/uitest/src/com/vaadin/tests/TestForBasicApplicationLayout.java
@@ -18,7 +18,7 @@ package com.vaadin.tests;
 
 import java.util.Locale;
 
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
diff --git a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java b/uitest/src/com/vaadin/tests/TestForChildComponentRendering.java
index 81b21c46c3..da6b7ddf3e 100644
--- a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java
+++ b/uitest/src/com/vaadin/tests/TestForChildComponentRendering.java
@@ -19,7 +19,7 @@ package com.vaadin.tests;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java b/uitest/src/com/vaadin/tests/TestForContainerFilterable.java
index eb51ba6a52..eb51ba6a52 100644
--- a/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java
+++ b/uitest/src/com/vaadin/tests/TestForContainerFilterable.java
diff --git a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java b/uitest/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
index eb807504fa..a94198b1c8 100644
--- a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
+++ b/uitest/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
@@ -19,7 +19,7 @@ package com.vaadin.tests;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java b/uitest/src/com/vaadin/tests/TestForMultipleStyleNames.java
index 252a4c9c1e..252a4c9c1e 100644
--- a/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java
+++ b/uitest/src/com/vaadin/tests/TestForMultipleStyleNames.java
diff --git a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/com/vaadin/tests/TestForNativeWindowing.java
index 41b3309c57..cef9269b53 100644
--- a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java
+++ b/uitest/src/com/vaadin/tests/TestForNativeWindowing.java
@@ -96,7 +96,7 @@ public class TestForNativeWindowing extends Application.LegacyApplication {
                     public void buttonClick(ClickEvent event) {
                         try {
                             main.open(
-                                    new com.vaadin.terminal.ExternalResource(
+                                    new com.vaadin.server.ExternalResource(
                                             new URL(
                                                     getURL(),
                                                     "mainwin-"
diff --git a/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java b/uitest/src/com/vaadin/tests/TestForPreconfiguredComponents.java
index d01879f769..d01879f769 100644
--- a/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java
+++ b/uitest/src/com/vaadin/tests/TestForPreconfiguredComponents.java
diff --git a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java b/uitest/src/com/vaadin/tests/TestForRichTextEditor.java
index 9d4c679648..9d4c679648 100644
--- a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java
+++ b/uitest/src/com/vaadin/tests/TestForRichTextEditor.java
diff --git a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/com/vaadin/tests/TestForStyledUpload.java
index af41ccc37b..14fe7902aa 100644
--- a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/com/vaadin/tests/TestForStyledUpload.java
@@ -27,8 +27,8 @@ import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 
 import com.vaadin.Application;
+import com.vaadin.server.StreamResource;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.StreamResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
@@ -189,7 +189,7 @@ public class TestForStyledUpload extends Application.LegacyApplication
                     + " bytes.", ContentMode.XHTML));
 
             status.addComponent(new Link("Download " + buffer.getFileName(),
-                    new StreamResource(buffer, buffer.getFileName(), this)));
+                    new StreamResource(buffer, buffer.getFileName())));
 
             status.setVisible(true);
         }
diff --git a/tests/testbench/com/vaadin/tests/TestForTabSheet.java b/uitest/src/com/vaadin/tests/TestForTabSheet.java
index d180bd4be3..d180bd4be3 100644
--- a/tests/testbench/com/vaadin/tests/TestForTabSheet.java
+++ b/uitest/src/com/vaadin/tests/TestForTabSheet.java
diff --git a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/uitest/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
index 61cf9c1c16..ac69cbd096 100644
--- a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
+++ b/uitest/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
@@ -19,7 +19,7 @@ package com.vaadin.tests;
 import java.util.Iterator;
 import java.util.Vector;
 
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CustomComponent;
diff --git a/tests/testbench/com/vaadin/tests/TestForTrees.java b/uitest/src/com/vaadin/tests/TestForTrees.java
index c0d8ec3845..c0d8ec3845 100644
--- a/tests/testbench/com/vaadin/tests/TestForTrees.java
+++ b/uitest/src/com/vaadin/tests/TestForTrees.java
diff --git a/tests/testbench/com/vaadin/tests/TestForUpload.java b/uitest/src/com/vaadin/tests/TestForUpload.java
index d42870b5b1..b0697d337d 100644
--- a/tests/testbench/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/com/vaadin/tests/TestForUpload.java
@@ -29,8 +29,8 @@ import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 
 import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.server.StreamResource;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.StreamResource;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -160,7 +160,7 @@ public class TestForUpload extends CustomComponent implements
 
                     status.addComponent(new Link("Download "
                             + buffer.getFileName(), new StreamResource(buffer,
-                            buffer.getFileName(), getApplication())));
+                            buffer.getFileName())));
 
                     status.setVisible(true);
                 }
diff --git a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java b/uitest/src/com/vaadin/tests/TestForWindowOpen.java
index 3b5c7404e7..253fd3aeea 100644
--- a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java
+++ b/uitest/src/com/vaadin/tests/TestForWindowOpen.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CustomComponent;
diff --git a/tests/testbench/com/vaadin/tests/TestForWindowing.java b/uitest/src/com/vaadin/tests/TestForWindowing.java
index a59323b97c..a59323b97c 100644
--- a/tests/testbench/com/vaadin/tests/TestForWindowing.java
+++ b/uitest/src/com/vaadin/tests/TestForWindowing.java
diff --git a/tests/testbench/com/vaadin/tests/TestIFrames.java b/uitest/src/com/vaadin/tests/TestIFrames.java
index e0de636f2c..e0de636f2c 100644
--- a/tests/testbench/com/vaadin/tests/TestIFrames.java
+++ b/uitest/src/com/vaadin/tests/TestIFrames.java
diff --git a/tests/testbench/com/vaadin/tests/TestMethodProperty.java b/uitest/src/com/vaadin/tests/TestMethodProperty.java
index 49a3c110fa..49a3c110fa 100644
--- a/tests/testbench/com/vaadin/tests/TestMethodProperty.java
+++ b/uitest/src/com/vaadin/tests/TestMethodProperty.java
diff --git a/tests/testbench/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java b/uitest/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
index a4e8d184f4..a4e8d184f4 100644
--- a/tests/testbench/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
+++ b/uitest/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
diff --git a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java b/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java
index 6bb8bac200..6bb8bac200 100644
--- a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java
+++ b/uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java
diff --git a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java
index a0ff6f0fc7..6121647bc1 100644
--- a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java
+++ b/uitest/src/com/vaadin/tests/TestSizeableIncomponents.java
@@ -25,7 +25,7 @@ import com.vaadin.Application;
 import com.vaadin.data.Container;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractSelect;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/TestSplitPanel.java b/uitest/src/com/vaadin/tests/TestSplitPanel.java
index 4b0b47ed74..4b0b47ed74 100644
--- a/tests/testbench/com/vaadin/tests/TestSplitPanel.java
+++ b/uitest/src/com/vaadin/tests/TestSplitPanel.java
diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystem.java b/uitest/src/com/vaadin/tests/TreeFilesystem.java
index f2a0d97b08..f2a0d97b08 100644
--- a/tests/testbench/com/vaadin/tests/TreeFilesystem.java
+++ b/uitest/src/com/vaadin/tests/TreeFilesystem.java
diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java
index 672c518ea8..672c518ea8 100644
--- a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/uitest/src/com/vaadin/tests/TreeFilesystemContainer.java
diff --git a/tests/testbench/com/vaadin/tests/UpgradingSample.java b/uitest/src/com/vaadin/tests/UpgradingSample.java
index 48e2222d7e..48e2222d7e 100644
--- a/tests/testbench/com/vaadin/tests/UpgradingSample.java
+++ b/uitest/src/com/vaadin/tests/UpgradingSample.java
diff --git a/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java b/uitest/src/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
index b91fd65842..b91fd65842 100644
--- a/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
+++ b/uitest/src/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
diff --git a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java
index c5a836b4f1..c5a836b4f1 100644
--- a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java
+++ b/uitest/src/com/vaadin/tests/UsingObjectsInSelect.java
diff --git a/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.html b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.html
index 8313eceeab..8313eceeab 100644
--- a/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.html
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.html
diff --git a/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
index 63deb79f66..8a07168ef7 100644
--- a/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.java
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersion.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests;
 
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
-import com.vaadin.terminal.gwt.server.WebBrowser;
+import com.vaadin.server.WebApplicationContext;
+import com.vaadin.server.WebBrowser;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
 
diff --git a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java b/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java
index 9fa716a23e..a7d2b03415 100644
--- a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java
+++ b/uitest/src/com/vaadin/tests/appengine/GAESyncTest.java
@@ -4,16 +4,16 @@ import com.google.apphosting.api.DeadlineExceededException;
 import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.terminal.ClassResource;
-import com.vaadin.terminal.DownloadStream;
+import com.vaadin.server.ClassResource;
+import com.vaadin.server.DownloadStream;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.TextField;
+import com.vaadin.ui.UI.LegacyWindow;
 
 public class GAESyncTest extends Application.LegacyApplication {
 
@@ -29,7 +29,7 @@ public class GAESyncTest extends Application.LegacyApplication {
     }
 
     @Override
-    public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) {
+    public void terminalError(com.vaadin.server.Terminal.ErrorEvent event) {
         Throwable t = event.getThrowable();
         // Was this caused by a GAE timeout?
         while (t != null) {
@@ -116,7 +116,7 @@ public class GAESyncTest extends Application.LegacyApplication {
         }
 
         private void addImage() {
-            ClassResource res = new ClassResource("img1.png", app) {
+            ClassResource res = new ClassResource("img1.png") {
 
                 private static final long serialVersionUID = 1L;
 
diff --git a/tests/testbench/com/vaadin/tests/appengine/img1.png b/uitest/src/com/vaadin/tests/appengine/img1.png
index d249324e0c..d249324e0c 100644
--- a/tests/testbench/com/vaadin/tests/appengine/img1.png
+++ b/uitest/src/com/vaadin/tests/appengine/img1.png
diff --git a/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java b/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java
index cfbb4045a2..233da9722e 100644
--- a/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java
+++ b/uitest/src/com/vaadin/tests/application/ApplicationCloseTest.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.application;
 
 import com.vaadin.Application;
+import com.vaadin.server.WebApplicationContext;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.html b/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.html
index ee200d7f5c..ee200d7f5c 100644
--- a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.html
+++ b/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.html
diff --git a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java b/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.java
index d7e9155ded..d7e9155ded 100644
--- a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java
+++ b/uitest/src/com/vaadin/tests/application/ErrorInUnloadEvent.java
diff --git a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.html b/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.html
index d48ab220b5..d48ab220b5 100644
--- a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.html
+++ b/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.html
diff --git a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java b/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.java
index 1e6509ab85..3013659ed7 100644
--- a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
+++ b/uitest/src/com/vaadin/tests/application/RefreshStatePreserve.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.application;
 
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.terminal.AbstractUIProvider;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.AbstractUIProvider;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
diff --git a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.html b/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.html
index f20967c8de..f20967c8de 100644
--- a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.html
+++ b/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.html
diff --git a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java b/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.java
index 992a3afbca..0dcf0a6fa8 100644
--- a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java
+++ b/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.java
@@ -38,7 +38,7 @@ public class TerminalErrorNotification extends TestBase {
     }
 
     @Override
-    public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) {
+    public void terminalError(com.vaadin.server.Terminal.ErrorEvent event) {
         event.getThrowable().printStackTrace();
 
         UI mainWindow = getMainWindow();
diff --git a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.html b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.html
index 35657c73fc..35657c73fc 100644
--- a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.html
+++ b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.html
diff --git a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
index fa5ab7d100..0e7dd1b242 100644
--- a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java
+++ b/uitest/src/com/vaadin/tests/application/ThreadLocalInstances.java
@@ -2,10 +2,9 @@ package com.vaadin.tests.application;
 
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.terminal.ApplicationResource;
-import com.vaadin.terminal.DownloadStream;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.DownloadStream;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestApplication;
 import com.vaadin.tests.integration.FlagSeResource;
 import com.vaadin.tests.util.Log;
@@ -28,7 +27,7 @@ public class ThreadLocalInstances extends AbstractTestApplication {
         }
 
         @Override
-        public void paintContent(com.vaadin.terminal.PaintTarget target)
+        public void paintContent(com.vaadin.server.PaintTarget target)
                 throws PaintException {
             if (!paintReported) {
                 reportCurrentStatus("root paint");
@@ -47,7 +46,7 @@ public class ThreadLocalInstances extends AbstractTestApplication {
         }
     };
 
-    private final ApplicationResource resource = new FlagSeResource(this) {
+    private final FlagSeResource resource = new FlagSeResource() {
         @Override
         public DownloadStream getStream() {
             reportCurrentStatus("resource handler");
diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.html b/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.html
index 3c59c7a953..3c59c7a953 100644
--- a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.html
+++ b/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.html
diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java b/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.java
index 817acf20b5..817acf20b5 100644
--- a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java
+++ b/uitest/src/com/vaadin/tests/application/WebBrowserSizeTest.java
diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.html b/uitest/src/com/vaadin/tests/application/WebBrowserTest.html
index f04dd564bf..f04dd564bf 100644
--- a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.html
+++ b/uitest/src/com/vaadin/tests/application/WebBrowserTest.html
diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java b/uitest/src/com/vaadin/tests/application/WebBrowserTest.java
index 004c8f1c91..004c8f1c91 100644
--- a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/application/WebBrowserTest.java
diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.html b/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.html
index 6d028f1fea..6d028f1fea 100644
--- a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.html
+++ b/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.html
diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java
index 3169806f27..9146cf5dea 100644
--- a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java
+++ b/uitest/src/com/vaadin/tests/applicationcontext/ChangeSessionId.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.applicationcontext;
 
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
+import com.vaadin.server.WebApplicationContext;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java b/uitest/src/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java
index f1730ed5f5..f1730ed5f5 100644
--- a/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java
+++ b/uitest/src/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java
diff --git a/tests/testbench/com/vaadin/tests/applicationservlet/NoApplicationClass.html b/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClass.html
index 70bb8cc8f3..70bb8cc8f3 100644
--- a/tests/testbench/com/vaadin/tests/applicationservlet/NoApplicationClass.html
+++ b/uitest/src/com/vaadin/tests/applicationservlet/NoApplicationClass.html
diff --git a/tests/testbench/com/vaadin/tests/applicationservlet/NoMainWindow.java b/uitest/src/com/vaadin/tests/applicationservlet/NoMainWindow.java
index fc72b86a34..fc72b86a34 100644
--- a/tests/testbench/com/vaadin/tests/applicationservlet/NoMainWindow.java
+++ b/uitest/src/com/vaadin/tests/applicationservlet/NoMainWindow.java
diff --git a/tests/testbench/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html b/uitest/src/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html
index 37fee35746..37fee35746 100644
--- a/tests/testbench/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html
+++ b/uitest/src/com/vaadin/tests/browserfeatures/FullHeightScrollbar.html
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java b/uitest/src/com/vaadin/tests/components/AbstractComponentContainerTest.java
index be3b7760f2..be3b7760f2 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractComponentContainerTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java b/uitest/src/com/vaadin/tests/components/AbstractComponentTest.java
index cece73a14d..ece40f5b00 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractComponentTest.java
@@ -14,8 +14,8 @@ import com.vaadin.event.FieldEvents.BlurNotifier;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.event.FieldEvents.FocusNotifier;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.util.Log;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.AbstractComponent;
@@ -715,7 +715,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
     }
 
     @Override
-    public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) {
+    public void terminalError(com.vaadin.server.Terminal.ErrorEvent event) {
         String logMsg = "Exception occured, "
                 + event.getThrowable().getClass().getName();
 
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java b/uitest/src/com/vaadin/tests/components/AbstractComponentTestCase.java
index d8ae43fd6d..81ec4a9da4 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractComponentTestCase.java
@@ -5,9 +5,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Field;
 import com.vaadin.ui.Layout.SpacingHandler;
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java b/uitest/src/com/vaadin/tests/components/AbstractLayoutTest.java
index c04be3d724..c04be3d724 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractLayoutTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java b/uitest/src/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
index 1d18cba952..1d18cba952 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractOrderedLayoutTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestApplication.java b/uitest/src/com/vaadin/tests/components/AbstractTestApplication.java
index 8de1e68b4b..406158e8e1 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractTestApplication.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestApplication.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components;
 
 import com.vaadin.Application;
+import com.vaadin.server.AbstractWebApplicationContext;
+import com.vaadin.server.WebBrowser;
 import com.vaadin.service.ApplicationContext;
-import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext;
-import com.vaadin.terminal.gwt.server.WebBrowser;
 
 public abstract class AbstractTestApplication extends Application {
     protected abstract String getTestDescription();
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestCase.java b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java
index 11d960e143..4e2ec1d935 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractTestCase.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestCase.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components;
 
 import com.vaadin.Application;
+import com.vaadin.server.AbstractWebApplicationContext;
+import com.vaadin.server.WebBrowser;
 import com.vaadin.service.ApplicationContext;
-import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext;
-import com.vaadin.terminal.gwt.server.WebBrowser;
 
 public abstract class AbstractTestCase extends Application.LegacyApplication {
 
diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
index 7dd742952f..ff235c5d9f 100644
--- a/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java
+++ b/uitest/src/com/vaadin/tests/components/AbstractTestUI.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components;
 
 import com.vaadin.Application;
+import com.vaadin.server.AbstractWebApplicationContext;
+import com.vaadin.server.WebBrowser;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.service.ApplicationContext;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext;
-import com.vaadin.terminal.gwt.server.WebBrowser;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
diff --git a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html b/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html
index 512140cc6d..512140cc6d 100644
--- a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html
+++ b/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java b/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
index 926af72a2f..926af72a2f 100644
--- a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
+++ b/uitest/src/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java b/uitest/src/com/vaadin/tests/components/ComponentTestCase.java
index 9bb01cd56f..9bb01cd56f 100644
--- a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java
+++ b/uitest/src/com/vaadin/tests/components/ComponentTestCase.java
diff --git a/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java b/uitest/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
index 9fe13c457a..9fe13c457a 100644
--- a/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
+++ b/uitest/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.html b/uitest/src/com/vaadin/tests/components/DisableEnableCascade.html
index 029da64754..029da64754 100644
--- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.html
+++ b/uitest/src/com/vaadin/tests/components/DisableEnableCascade.html
diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java b/uitest/src/com/vaadin/tests/components/DisableEnableCascade.java
index cd284224a0..cd284224a0 100644
--- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java
+++ b/uitest/src/com/vaadin/tests/components/DisableEnableCascade.java
diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.html b/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.html
index ac3a4f0cb0..ac3a4f0cb0 100644
--- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.html
+++ b/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.html
diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java b/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.java
index 0279a92437..0279a92437 100644
--- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java
+++ b/uitest/src/com/vaadin/tests/components/DisableEnableCascadeStyles.java
diff --git a/tests/testbench/com/vaadin/tests/components/ErrorMessages.html b/uitest/src/com/vaadin/tests/components/ErrorMessages.html
index 5379ff59e0..5379ff59e0 100644
--- a/tests/testbench/com/vaadin/tests/components/ErrorMessages.html
+++ b/uitest/src/com/vaadin/tests/components/ErrorMessages.html
diff --git a/tests/testbench/com/vaadin/tests/components/ErrorMessages.java b/uitest/src/com/vaadin/tests/components/ErrorMessages.java
index d4008a4dfb..0e8dcc210b 100644
--- a/tests/testbench/com/vaadin/tests/components/ErrorMessages.java
+++ b/uitest/src/com/vaadin/tests/components/ErrorMessages.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.terminal.CompositeErrorMessage;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.CompositeErrorMessage;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.TextField;
diff --git a/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java b/uitest/src/com/vaadin/tests/components/FocusAndBlurListeners.java
index 7987c800f9..7987c800f9 100644
--- a/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java
+++ b/uitest/src/com/vaadin/tests/components/FocusAndBlurListeners.java
diff --git a/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java b/uitest/src/com/vaadin/tests/components/FocusFromShortcutAction.java
index cffc8ca27b..cffc8ca27b 100644
--- a/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java
+++ b/uitest/src/com/vaadin/tests/components/FocusFromShortcutAction.java
diff --git a/tests/testbench/com/vaadin/tests/components/HierarchicalContainerSorting.java b/uitest/src/com/vaadin/tests/components/HierarchicalContainerSorting.java
index d0638be54c..d0638be54c 100644
--- a/tests/testbench/com/vaadin/tests/components/HierarchicalContainerSorting.java
+++ b/uitest/src/com/vaadin/tests/components/HierarchicalContainerSorting.java
diff --git a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.html b/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.html
index 10dd21d240..10dd21d240 100644
--- a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.html
+++ b/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.html
diff --git a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java b/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.java
index 6e54c0d9f4..6e54c0d9f4 100644
--- a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java
+++ b/uitest/src/com/vaadin/tests/components/LayoutAttachListenerInfo.java
diff --git a/tests/testbench/com/vaadin/tests/components/LongTooltip.html b/uitest/src/com/vaadin/tests/components/LongTooltip.html
index a5055741f1..a5055741f1 100644
--- a/tests/testbench/com/vaadin/tests/components/LongTooltip.html
+++ b/uitest/src/com/vaadin/tests/components/LongTooltip.html
diff --git a/tests/testbench/com/vaadin/tests/components/LongTooltip.java b/uitest/src/com/vaadin/tests/components/LongTooltip.java
index acb498bcee..acb498bcee 100644
--- a/tests/testbench/com/vaadin/tests/components/LongTooltip.java
+++ b/uitest/src/com/vaadin/tests/components/LongTooltip.java
diff --git a/tests/testbench/com/vaadin/tests/components/MultipleDebugIds.java b/uitest/src/com/vaadin/tests/components/MultipleDebugIds.java
index 4633b4f1cd..4633b4f1cd 100644
--- a/tests/testbench/com/vaadin/tests/components/MultipleDebugIds.java
+++ b/uitest/src/com/vaadin/tests/components/MultipleDebugIds.java
diff --git a/tests/testbench/com/vaadin/tests/components/TestBase.java b/uitest/src/com/vaadin/tests/components/TestBase.java
index 19c6826977..19c6826977 100644
--- a/tests/testbench/com/vaadin/tests/components/TestBase.java
+++ b/uitest/src/com/vaadin/tests/components/TestBase.java
diff --git a/tests/testbench/com/vaadin/tests/components/TouchScrollables.java b/uitest/src/com/vaadin/tests/components/TouchScrollables.java
index 6c340804af..6c340804af 100644
--- a/tests/testbench/com/vaadin/tests/components/TouchScrollables.java
+++ b/uitest/src/com/vaadin/tests/components/TouchScrollables.java
diff --git a/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.html b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.html
new file mode 100644
index 0000000000..20f0e8e71e
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.html
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.UnknownComponentConnectorTest?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>vaadin=runcomvaadintestscomponentsUnknownComponentConnectorTest::/VVerticalLayout[0]/VVerticalLayout[0]/VUnknownComponent[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>Widgetset does not contain implementation for com.vaadin.tests.components.UnknownComponentConnectorTest.ComponentWithoutConnector. Check its component connector's @Connect mapping, widgetsets GWT module description file and re-compile your widgetset. In case you have downloaded a vaadin add-on package, you might want to refer to add-on instructions.</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java
new file mode 100644
index 0000000000..197408a533
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/UnknownComponentConnectorTest.java
@@ -0,0 +1,45 @@
+/*
+ * 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.tests.components;
+
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.ui.AbstractComponent;
+
+public class UnknownComponentConnectorTest extends AbstractTestUI {
+
+    public static class ComponentWithoutConnector extends AbstractComponent {
+
+    }
+
+    @Override
+    protected void setup(WrappedRequest request) {
+        addComponent(new ComponentWithoutConnector());
+    }
+
+    @Override
+    protected String getTestDescription() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}
diff --git a/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html b/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
index ff5c890abf..ff5c890abf 100644
--- a/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
+++ b/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
diff --git a/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java b/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
index f6bff579a3..f6bff579a3 100644
--- a/tests/testbench/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
+++ b/uitest/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
diff --git a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html b/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
index bb74775912..bb74775912 100644
--- a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
+++ b/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html
diff --git a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java b/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
index c14cda58f1..c14cda58f1 100644
--- a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
+++ b/uitest/src/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
index 5deec3b4f5..d318afc34f 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.components.abstractcomponent;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.VaadinClasses;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractComponent;
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.html b/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.html
index dacd5c5009..dacd5c5009 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.html
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.html
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.java
index e93529fad4..e93529fad4 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/EnableState.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.html b/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.html
index 3cea965690..3cea965690 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.html
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.html
diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
index 01c7ab83ae..01c7ab83ae 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/TooltipTests.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
index 9b29ae1bab..9b29ae1bab 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
index 6a47032545..6a47032545 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
index 0aaa7c5f13..0aaa7c5f13 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
index f99bdea946..f99bdea946 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.html
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
index f1b96d24fd..f1b96d24fd 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
index efba67199d..efba67199d 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
index 1f407c710f..1f407c710f 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java b/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
index d4b2f89522..d4b2f89522 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java b/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
index aa8c7ff778..aa8c7ff778 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/DoubleInTextField.java b/uitest/src/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
index 4fd81081ea..4fd81081ea 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java b/uitest/src/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
index 01fcb02b77..01fcb02b77 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java b/uitest/src/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
index 929247fc80..929247fc80 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html b/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
index a7b8e24ae7..a7b8e24ae7 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.html
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java b/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
index 309e297374..309e297374 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java b/uitest/src/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
index fc08a4505c..3a8275bd51 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
@@ -5,7 +5,7 @@ import java.util.Date;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.AbstractComponent.ComponentErrorEvent;
 import com.vaadin.ui.AbstractComponent.ComponentErrorHandler;
 import com.vaadin.ui.ComboBox;
diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java b/uitest/src/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
index a9aa4d2a43..a9aa4d2a43 100644
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
diff --git a/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html b/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
index e4bb6c36be..e4bb6c36be 100644
--- a/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
+++ b/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.html
diff --git a/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java b/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
index 387ec7857f..387ec7857f 100644
--- a/tests/testbench/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
+++ b/uitest/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/accordion/AccordionTest.java b/uitest/src/com/vaadin/tests/components/accordion/AccordionTest.java
index 5c47610ae5..5c47610ae5 100644
--- a/tests/testbench/com/vaadin/tests/components/accordion/AccordionTest.java
+++ b/uitest/src/com/vaadin/tests/components/accordion/AccordionTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.html b/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.html
index ec24ade8ce..ec24ade8ce 100644
--- a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.html
+++ b/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.html
diff --git a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java b/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.java
index d24def22dd..d24def22dd 100644
--- a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java
+++ b/uitest/src/com/vaadin/tests/components/accordion/RemoveTabs.java
diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
index 254779f872..254779f872 100644
--- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
+++ b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
index e40be7dc15..e40be7dc15 100644
--- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
+++ b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.html
diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
index 605ab676b6..605ab676b6 100644
--- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
+++ b/uitest/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html b/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
index a37e8ea662..a37e8ea662 100644
--- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
+++ b/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java b/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
index 20becea974..20becea974 100644
--- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
+++ b/uitest/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonDisableOnClick.html b/uitest/src/com/vaadin/tests/components/button/ButtonDisableOnClick.html
index d39f72ef1f..d39f72ef1f 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonDisableOnClick.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonDisableOnClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html b/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html
index 5ec33f09fa..5ec33f09fa 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java b/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
index 0d4981a441..0d4981a441 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java b/uitest/src/com/vaadin/tests/components/button/ButtonErrorMessage.java
index b27f948669..b27f948669 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonErrorMessage.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.html b/uitest/src/com/vaadin/tests/components/button/ButtonHtml.html
index 2d58d0e2e1..2d58d0e2e1 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonHtml.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java b/uitest/src/com/vaadin/tests/components/button/ButtonHtml.java
index 5cdc34e8e8..5cdc34e8e8 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonHtml.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java b/uitest/src/com/vaadin/tests/components/button/ButtonMouseDetails.java
index 1b6a81551a..1b6a81551a 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonMouseDetails.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonTabIndex.java b/uitest/src/com/vaadin/tests/components/button/ButtonTabIndex.java
index e1c8b2faea..e1c8b2faea 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonTabIndex.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonTabIndex.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonTooltips.html b/uitest/src/com/vaadin/tests/components/button/ButtonTooltips.html
index 13fdf52c76..13fdf52c76 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonTooltips.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonTooltips.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonTooltips.java b/uitest/src/com/vaadin/tests/components/button/ButtonTooltips.java
index fa639918aa..fa639918aa 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonTooltips.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonTooltips.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.html b/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
index 0aaa01f05b..0aaa01f05b 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.java b/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
index 89b03df92a..89b03df92a 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons-chameleon.html b/uitest/src/com/vaadin/tests/components/button/Buttons-chameleon.html
index 4830c79bcf..4830c79bcf 100644
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/button/Buttons-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons-reindeer.html b/uitest/src/com/vaadin/tests/components/button/Buttons-reindeer.html
index 43e554bec5..43e554bec5 100644
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons-reindeer.html
+++ b/uitest/src/com/vaadin/tests/components/button/Buttons-reindeer.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons-runo.html b/uitest/src/com/vaadin/tests/components/button/Buttons-runo.html
index 27779f170b..27779f170b 100644
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons-runo.html
+++ b/uitest/src/com/vaadin/tests/components/button/Buttons-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons.java b/uitest/src/com/vaadin/tests/components/button/Buttons.java
index 573c95c2b8..573c95c2b8 100644
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons.java
+++ b/uitest/src/com/vaadin/tests/components/button/Buttons.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons2.java b/uitest/src/com/vaadin/tests/components/button/Buttons2.java
index 7526e7dbc3..7526e7dbc3 100644
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons2.java
+++ b/uitest/src/com/vaadin/tests/components/button/Buttons2.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
index 5425ebb716..5425ebb716 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
index 6bee11d561..6bee11d561 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-reindeer.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
index 8084a58536..8084a58536 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons.java
index 56fc5f208c..4ab18e994a 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsAndIcons.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsAndIcons.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.button;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.NativeButton;
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html b/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html
index cb3b5e66ee..cb3b5e66ee 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java b/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
index 3a0afdce50..3a0afdce50 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
+++ b/uitest/src/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.html b/uitest/src/com/vaadin/tests/components/button/DisabledButtons.html
index 65584fd4d0..65584fd4d0 100644
--- a/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.html
+++ b/uitest/src/com/vaadin/tests/components/button/DisabledButtons.html
diff --git a/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.java b/uitest/src/com/vaadin/tests/components/button/DisabledButtons.java
index 3e438a5d5b..73dbd95829 100644
--- a/tests/testbench/com/vaadin/tests/components/button/DisabledButtons.java
+++ b/uitest/src/com/vaadin/tests/components/button/DisabledButtons.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.button;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java b/uitest/src/com/vaadin/tests/components/button/ShortCutListenerModification.java
index 4fb8df678e..d0321100dd 100644
--- a/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java
+++ b/uitest/src/com/vaadin/tests/components/button/ShortCutListenerModification.java
@@ -53,7 +53,7 @@ public class ShortCutListenerModification extends TestBase implements
     }
 
     @Override
-    public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) {
+    public void terminalError(com.vaadin.server.Terminal.ErrorEvent event) {
         super.terminalError(event);
         getMainWindow().showNotification("Failed!",
                 Notification.TYPE_ERROR_MESSAGE);
diff --git a/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java b/uitest/src/com/vaadin/tests/components/button/TooltipForDisabledButton.java
index c1f1846415..c1f1846415 100644
--- a/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java
+++ b/uitest/src/com/vaadin/tests/components/button/TooltipForDisabledButton.java
diff --git a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.html b/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.html
index f1ede9a04b..f1ede9a04b 100644
--- a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.html
+++ b/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.html
diff --git a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.java b/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.java
index 8e0e8d1071..05b8333e7d 100644
--- a/tests/testbench/com/vaadin/tests/components/caption/EmptyCaptions.java
+++ b/uitest/src/com/vaadin/tests/components/caption/EmptyCaptions.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.caption;
 
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.UserError;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.TextField;
 
diff --git a/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java b/uitest/src/com/vaadin/tests/components/caption/IconsInCaption.java
index 57ef9e6656..46539b42d7 100644
--- a/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java
+++ b/uitest/src/com/vaadin/tests/components/caption/IconsInCaption.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.caption;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ThemeResource;
 import com.vaadin.tests.VaadinClasses;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
diff --git a/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.html b/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
index 7c94821e7f..7c94821e7f 100644
--- a/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.html
+++ b/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
diff --git a/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.java b/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java
index 603fdf458b..d09b5c02ac 100644
--- a/tests/testbench/com/vaadin/tests/components/caption/LargeCaptionIcon.java
+++ b/uitest/src/com/vaadin/tests/components/caption/LargeCaptionIcon.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.caption;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html
index ddcdc68691..ddcdc68691 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxDisabledReadOnlyValueChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html
index 9717ccec78..9717ccec78 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.html
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
index 28abf5172d..22e260b442 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.checkbox;
 
 import com.vaadin.data.Validator.InvalidValueException;
-import com.vaadin.terminal.AbstractErrorMessage;
+import com.vaadin.server.AbstractErrorMessage;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.html b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.html
index 601be4e1cb..601be4e1cb 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.html
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.html
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.java
index f4d65b8d53..24f53889b3 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes.java
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.checkbox;
 
 import java.util.Date;
 
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.ui.CheckBox;
 
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java
index 6734c752de..6734c752de 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckBoxes2.java
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
index 26ecc95721..26ecc95721 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
index 463d53a4a8..463d53a4a8 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.java
diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxIcon.java b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxIcon.java
index 6fa714a6d7..50998a96eb 100644
--- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckboxIcon.java
+++ b/uitest/src/com/vaadin/tests/components/checkbox/CheckboxIcon.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.checkbox;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.CheckBox;
 
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html
index 9248938b28..9248938b28 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainText.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
index 1689c7c1fc..1689c7c1fc 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
index 38bdf0c5fe..38bdf0c5fe 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
index cab8bbc996..cab8bbc996 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
index a475c86ca0..a475c86ca0 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
index c5e411678d..c5e411678d 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxFiltering.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxFiltering.html
index 3de221871d..3de221871d 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxFiltering.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxFiltering.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.html
index 3ad7d62a09..3ad7d62a09 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
index 5f33b96a73..5f33b96a73 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.htm b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.htm
index f943f912e4..f943f912e4 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.htm
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.htm
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
index 393a8ceb6b..393a8ceb6b 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
index 5a488e5dc5..5a488e5dc5 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
index 1459a30985..1459a30985 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
index 0afa1e887e..0afa1e887e 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
index 6e6e87bc7e..6e6e87bc7e 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
index 75325b798f..62ae652dd0 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.combobox;
 
 import com.vaadin.data.Item;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.ComboBox;
 
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
index fd2aceb7f2..fd2aceb7f2 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
index 0f8124ca20..07cd1f046c 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.combobox;
 import java.util.Date;
 
 import com.vaadin.data.Item;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.ComboBox;
 
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
index 03de00a6f1..03de00a6f1 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
index 245fc123df..245fc123df 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
index 2066da47c1..2066da47c1 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNoTextInput.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNullItem.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNullItem.html
index 3dc31f4a98..3dc31f4a98 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxNullItem.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxNullItem.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
index 50b95bfdc2..50b95bfdc2 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
index 10afb05ae3..10afb05ae3 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
index eec15d0b40..eec15d0b40 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxRemoveAllItems.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlow.java
index 0336ff423b..0336ff423b 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlow.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
index d98997d28f..d98997d28f 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
index ba251e5cc0..ba251e5cc0 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
index 24aea18314..24aea18314 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
index d33a858dc8..d33a858dc8 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
index ae0dfec828..ae0dfec828 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
index eb28a9ff4e..05b52dee80 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.combobox;
 
 import com.vaadin.data.Item;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.ComboBox;
 
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.html
index 2aab40f13f..2aab40f13f 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
index 9e1fab0cda..9e1fab0cda 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
index 76ee83384e..76ee83384e 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
index 3071ab4c2d..c72fdd7132 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
@@ -2,30 +2,29 @@ package com.vaadin.tests.components.combobox;
 
 import java.util.LinkedHashMap;
 
-import com.vaadin.terminal.Resource;
-import com.vaadin.tests.components.select.SelectTest;
+import com.vaadin.server.Resource;
+import com.vaadin.tests.components.select.AbstractSelectTestCase;
 import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.Select;
 
-public class ComboBoxes2 extends SelectTest<ComboBox> {
+public class ComboBoxes2<T extends ComboBox> extends AbstractSelectTestCase<T> {
 
-    private Command<ComboBox, String> inputPromptCommand = new Command<ComboBox, String>() {
+    private Command<T, String> inputPromptCommand = new Command<T, String>() {
         @Override
-        public void execute(ComboBox c, String value, Object data) {
+        public void execute(T c, String value, Object data) {
             c.setInputPrompt(value);
         }
     };
-    private Command<ComboBox, Integer> filteringModeCommand = new Command<ComboBox, Integer>() {
+    private Command<T, Integer> filteringModeCommand = new Command<T, Integer>() {
 
         @Override
-        public void execute(ComboBox c, Integer value, Object data) {
+        public void execute(T c, Integer value, Object data) {
             c.setFilteringMode(value);
         }
     };
 
     @Override
-    protected Class<ComboBox> getTestClass() {
-        return ComboBox.class;
+    protected Class<T> getTestClass() {
+        return (Class<T>) ComboBox.class;
     }
 
     @Override
@@ -40,9 +39,9 @@ public class ComboBoxes2 extends SelectTest<ComboBox> {
 
     private void createTextInputAlowedAction(String category) {
         createBooleanAction("Text input allowed", category, true,
-                new Command<ComboBox, Boolean>() {
+                new Command<T, Boolean>() {
                     @Override
-                    public void execute(ComboBox c, Boolean value, Object data) {
+                    public void execute(T c, Boolean value, Object data) {
                         c.setTextInputAllowed(value.booleanValue());
                     }
                 });
@@ -50,9 +49,9 @@ public class ComboBoxes2 extends SelectTest<ComboBox> {
 
     private void createNewItemsAllowedAction(String category) {
         createBooleanAction("New items allowed", category, false,
-                new Command<ComboBox, Boolean>() {
+                new Command<T, Boolean>() {
                     @Override
-                    public void execute(ComboBox c, Boolean value, Object data) {
+                    public void execute(T c, Boolean value, Object data) {
                         c.setNewItemsAllowed(value.booleanValue());
                     }
                 });
@@ -60,9 +59,9 @@ public class ComboBoxes2 extends SelectTest<ComboBox> {
 
     private void createFilteringModeAction(String category) {
         LinkedHashMap<String, Integer> options = new LinkedHashMap<String, Integer>();
-        options.put("Off", Select.FILTERINGMODE_OFF);
-        options.put("Contains", Select.FILTERINGMODE_CONTAINS);
-        options.put("Starts with", Select.FILTERINGMODE_STARTSWITH);
+        options.put("Off", ComboBox.FILTERINGMODE_OFF);
+        options.put("Contains", ComboBox.FILTERINGMODE_CONTAINS);
+        options.put("Starts with", ComboBox.FILTERINGMODE_STARTSWITH);
 
         createSelectAction("Filtering mode", category, options, "Contains",
                 filteringModeCommand);
@@ -82,10 +81,10 @@ public class ComboBoxes2 extends SelectTest<ComboBox> {
     private void createItemIconSelect(String category) {
 
         createSelectAction("Icon", category, createIconOptions(false), "-",
-                new Command<ComboBox, Resource>() {
+                new Command<T, Resource>() {
 
                     @Override
-                    public void execute(ComboBox c, Resource value, Object data) {
+                    public void execute(T c, Resource value, Object data) {
                         for (Object id : c.getItemIds()) {
                             if (value == null) {
                                 c.setItemIcon(id, null);
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html b/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
index 4d91ce7838..4d91ce7838 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java b/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
index b9c222247b..b9c222247b 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.html b/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.html
index 4aa84a9453..4aa84a9453 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java b/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.java
index 5b1af58421..5b2608b389 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/Comboboxes.java
@@ -4,11 +4,10 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Component;
-import com.vaadin.ui.Select;
 
 public class Comboboxes extends ComponentTestCase<ComboBox> {
 
@@ -83,7 +82,7 @@ public class Comboboxes extends ComponentTestCase<ComboBox> {
         }
     }
 
-    private void populate(Select s, int nr) {
+    private void populate(ComboBox s, int nr) {
         String text = " an item ";
 
         String caption = "";
@@ -99,7 +98,7 @@ public class Comboboxes extends ComponentTestCase<ComboBox> {
 
     }
 
-    private void addItem(Select s, String string) {
+    private void addItem(ComboBox s, String string) {
         Object id = s.addItem();
         s.getItem(id).getItemProperty(CAPTION).setValue(string);
 
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java b/uitest/src/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
index 7f0816c842..7f0816c842 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java b/uitest/src/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
index f64fd6f5fa..c93da483ab 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
@@ -6,7 +6,6 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.Select;
 
 @SuppressWarnings("serial")
 public class GridLayoutComboBoxZoomOut extends AbstractTestCase {
@@ -26,7 +25,7 @@ public class GridLayoutComboBoxZoomOut extends AbstractTestCase {
         // formLayout.setWidth("100%");
         formLayout.setWidth("1000px");
 
-        Select countryField = new ComboBox();
+        ComboBox countryField = new ComboBox();
         countryField.addItem("Finland");
         countryField.addItem("Sweden");
         countryField.addItem("Canada");
@@ -35,7 +34,7 @@ public class GridLayoutComboBoxZoomOut extends AbstractTestCase {
         countryField.setWidth("100%");
         formLayout.addComponent(countryField);
 
-        Select statusField = new ComboBox();
+        ComboBox statusField = new ComboBox();
         statusField.addItem("Available");
         statusField.addItem("On vacation");
         statusField.addItem("Busy");
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java b/uitest/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java
index 00e9242a7a..00e9242a7a 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/NewItemsESCPress.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.html b/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.html
index 35a6bcf29a..35a6bcf29a 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.java b/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.java
index e22482ed8b..c73bb28c43 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/PopUpWidth.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/PopUpWidth.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.combobox;
 
 import com.vaadin.data.Item;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.ComboBox;
 
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html b/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html
index fc3862ebb7..fc3862ebb7 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java b/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
index ce6a24d9bd..1099d03786 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.combobox;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html b/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html
index b661aa2bd7..b661aa2bd7 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html
+++ b/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.html
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java b/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
index 654f42e233..654f42e233 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
+++ b/uitest/src/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/fi.gif b/uitest/src/com/vaadin/tests/components/combobox/fi.gif
index 8d3a191828..8d3a191828 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/fi.gif
+++ b/uitest/src/com/vaadin/tests/components/combobox/fi.gif
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/se.gif b/uitest/src/com/vaadin/tests/components/combobox/se.gif
index 80f6285228..80f6285228 100644
--- a/tests/testbench/com/vaadin/tests/components/combobox/se.gif
+++ b/uitest/src/com/vaadin/tests/components/combobox/se.gif
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java b/uitest/src/com/vaadin/tests/components/customcomponent/ClipContent.java
index 094a63c163..094a63c163 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/ClipContent.java
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
index 0a1b7212c9..0a1b7212c9 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.html
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
index 4311ad1f08..4311ad1f08 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
index 2351b02e2a..2351b02e2a 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html
index b2806afe5c..b2806afe5c 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.html
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java
index 28e4dfb385..28e4dfb385 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.html b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.html
index 954afb2adb..954afb2adb 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.html
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.html
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java
index 06dd39ac38..06dd39ac38 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html b/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
index 268d3074f7..268d3074f7 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.html
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java b/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
index 8a37d85b31..8170f152c2 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/EmbeddedInCustomComponent.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.customcomponent;
 
 import java.util.Date;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Embedded;
diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/template.htm b/uitest/src/com/vaadin/tests/components/customcomponent/template.htm
index fa023050da..fa023050da 100644
--- a/tests/testbench/com/vaadin/tests/components/customcomponent/template.htm
+++ b/uitest/src/com/vaadin/tests/components/customcomponent/template.htm
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java b/uitest/src/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
index 07c740a96d..07c740a96d 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/AddressField.java b/uitest/src/com/vaadin/tests/components/customfield/AddressField.java
index 2daeb7bf25..2daeb7bf25 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/AddressField.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/AddressField.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java b/uitest/src/com/vaadin/tests/components/customfield/AddressFormExample.java
index 693b1e11b1..693b1e11b1 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/AddressFormExample.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java b/uitest/src/com/vaadin/tests/components/customfield/BooleanField.java
index 409ecccca8..409ecccca8 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/BooleanField.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.html b/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.html
index 6b1b3e8a2d..6b1b3e8a2d 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.html
+++ b/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.html
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java b/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.java
index a52b168e84..a52b168e84 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/BooleanFieldExample.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedForm.java b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedForm.java
index d305afde1d..d305afde1d 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedForm.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedForm.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedFormExample.html b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.html
index 2af441bc83..2af441bc83 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedFormExample.html
+++ b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.html
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedFormExample.java b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.java
index aeb1984937..aeb1984937 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/EmbeddedFormExample.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/EmbeddedFormExample.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/NestedFormExample.html b/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.html
index f9f5783c05..f9f5783c05 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/NestedFormExample.html
+++ b/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.html
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/NestedFormExample.java b/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.java
index 91fb43f4e2..91fb43f4e2 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/NestedFormExample.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/NestedFormExample.java
diff --git a/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java b/uitest/src/com/vaadin/tests/components/customfield/NestedPersonForm.java
index 9b40074433..9b40074433 100644
--- a/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java
+++ b/uitest/src/com/vaadin/tests/components/customfield/NestedPersonForm.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.html b/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.html
index 8420888098..8420888098 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java b/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.java
index 1553594867..1553594867 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/CommitInvalid.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.html
index ed92afe378..ed92afe378 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.java b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.java
index c2afb4cba3..c2afb4cba3 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormat.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormat.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.html b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html
index 1acdded4cb..1acdded4cb 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java
index 247478256f..247478256f 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/CustomDateFormats.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
index f387695b5f..f387695b5f 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
index 8bc9887b82..8bc9887b82 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
index f2ef2123f6..f2ef2123f6 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
index 4cf7b98679..4cf7b98679 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldLocale.java
index 5d06895d11..5d06895d11 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldLocale.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
index 1a3b3858b8..1a3b3858b8 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
index f7541f0270..f7541f0270 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
index ac3296724b..ac3296724b 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html
index 444f8e3bac..444f8e3bac 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
index c085088917..c085088917 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
index ee19b52324..ee19b52324 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
index 392dbaf9c6..392dbaf9c6 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
index c502b9597e..c502b9597e 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.html b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.html
index be325ef2eb..be325ef2eb 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.java
index 6f31b4d80f..6f31b4d80f 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldTimezone.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java b/uitest/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
index bbe2423a3f..bbe2423a3f 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.html b/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.html
index f367fc383b..f367fc383b 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.java b/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.java
index 44260e9247..66de59ffde 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DatePopupStyleName.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DatePopupStyleName.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.datefield;
 
 import java.util.Date;
 
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.UserError;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
 
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java b/uitest/src/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
index b5842694f0..b5842694f0 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
index 48b11e1f7c..48b11e1f7c 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
+++ b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
index 403b82a2a7..403b82a2a7 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
index 4bf57177bd..4bf57177bd 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldTest.java b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
index 1c8d8cfae6..1c8d8cfae6 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
index 9e6b9ae75e..9e6b9ae75e 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldValueChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFields.java
index ea384d5634..ea384d5634 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFields.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html
index 6b79ef419b..6b79ef419b 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/InlineDateFieldsHiddenOnStart.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java b/uitest/src/com/vaadin/tests/components/datefield/LenientMode.java
index 585395d747..585395d747 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/LenientMode.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java b/uitest/src/com/vaadin/tests/components/datefield/LowResolution.java
index 9c2d3d7d51..9c2d3d7d51 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/LowResolution.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html b/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
index 9852b30ae7..9852b30ae7 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java b/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
index dab47ebdd9..dab47ebdd9 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
index 009ca0aaf9..009ca0aaf9 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldDisabledReadonly.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html
index 2783ed2aa3..2783ed2aa3 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
index a12bdfa44c..a12bdfa44c 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
index 9111388f5a..9111388f5a 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldMonth.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html
index 1ec418e523..1ec418e523 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
index 5a6f6517bd..5a6f6517bd 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
index 8ecf9a4731..8ecf9a4731 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
index 3e8b0678a7..3e8b0678a7 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFields.java
index e69de5de12..e69de5de12 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/PopupDateFields.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html b/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
index 6dc46e4eec..6dc46e4eec 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java b/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
index bd47622394..bd47622394 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html b/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
index 1cd79338e9..1cd79338e9 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java b/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
index da8f45690c..da8f45690c 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.html b/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
index 71c246593a..71c246593a 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.java b/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java
index 4fa7a6811a..4fa7a6811a 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/TestDatefieldYear.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html b/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
index 7f4cd92be2..7f4cd92be2 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullInlineDateField.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html b/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
index 9fabd8b1e7..9fabd8b1e7 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/TestSettingTimeOnInitiallyNullPopupDateField.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.html b/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.html
index 07b8b1b237..07b8b1b237 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java b/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.java
index a45d3b8ad0..a45d3b8ad0 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/ValueThroughProperty.java
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html b/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html
index 70441efd9f..70441efd9f 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html
+++ b/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java b/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
index b7b0f50947..b7b0f50947 100644
--- a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
+++ b/uitest/src/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.html b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.html
index 03ec163e40..03ec163e40 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.html
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.html
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
index 22ed5e5a4a..22ed5e5a4a 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html
index 3e7a7cb0a7..3e7a7cb0a7 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
index b143ddf2dc..b143ddf2dc 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.java
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html b/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html
index c85d7e0626..c85d7e0626 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html
diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
index 93f559f4e7..93f559f4e7 100644
--- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.html b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.html
index 066c55fe55..066c55fe55 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.html
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.html
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.java
index 9a412cee9d..aedfafe627 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedAltText.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.embedded;
 
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.html b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedApplet.html
index d8fb0593d1..d8fb0593d1 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.html
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedApplet.html
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedApplet.java
index 5091f3a929..4b318c3890 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedApplet.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedApplet.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.embedded;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
index 2dcd1b5071..2dcd1b5071 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.html
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
index c9b6991d8f..3c5801e90e 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.embedded;
 
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Embedded;
 
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedFlash.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedFlash.java
index fb6b55ded0..38aea4a4f0 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedFlash.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedFlash.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.embedded;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Embedded;
 
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
index 3020942844..52454e115e 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
@@ -11,7 +11,7 @@ import java.util.Date;
 
 import javax.imageio.ImageIO;
 
-import com.vaadin.terminal.StreamResource;
+import com.vaadin.server.StreamResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -38,7 +38,7 @@ public class EmbeddedImageRefresh extends TestBase {
         // Attach it to a resource.
         final MyImageSource imageSource = new MyImageSource();
         final StreamResource imageResource = new StreamResource(imageSource,
-                "testimage.png", this);
+                "testimage.png");
         imageResource.setCacheTime(0);
         embedded.setSource(imageResource);
 
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.html b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.html
index c550b0f5d9..c550b0f5d9 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.html
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.html
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.java
index 252229cbe3..025245ab64 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedPdf.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.embedded;
 
-import com.vaadin.terminal.ClassResource;
+import com.vaadin.server.ClassResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -25,7 +25,7 @@ public class EmbeddedPdf extends TestBase {
         player.setType(Embedded.TYPE_BROWSER);
         player.setWidth("400px");
         player.setHeight("300px");
-        player.setSource(new ClassResource(getClass(), "test.pdf", this));
+        player.setSource(new ClassResource(getClass(), "test.pdf"));
         addComponent(player);
 
         addComponent(new Button("Remove pdf", new Button.ClickListener() {
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedTooltip.java b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
index d8be22f507..aa24337013 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.embedded;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Embedded;
 
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.html b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.html
index d3debf3417..d3debf3417 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.html
+++ b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.java b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.java
index 5d626cfc0b..1724fc11b7 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/FlashIsVisible.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/FlashIsVisible.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.embedded;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Embedded;
 
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/TestApplet.java b/uitest/src/com/vaadin/tests/components/embedded/TestApplet.java
index 3cf7cf888b..3cf7cf888b 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/TestApplet.java
+++ b/uitest/src/com/vaadin/tests/components/embedded/TestApplet.java
diff --git a/tests/testbench/com/vaadin/tests/components/embedded/test.pdf b/uitest/src/com/vaadin/tests/components/embedded/test.pdf
index e44a87e9ad..e44a87e9ad 100644
--- a/tests/testbench/com/vaadin/tests/components/embedded/test.pdf
+++ b/uitest/src/com/vaadin/tests/components/embedded/test.pdf
diff --git a/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.html b/uitest/src/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.html
index 2d76cd48b2..2d76cd48b2 100644
--- a/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.html
+++ b/uitest/src/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java b/uitest/src/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java
index fdf9405855..2eaf712676 100644
--- a/tests/testbench/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java
+++ b/uitest/src/com/vaadin/tests/components/embeddedbrowser/EmbeddedBrowserIsVisible.java
@@ -4,7 +4,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 
-import com.vaadin.terminal.StreamResource;
+import com.vaadin.server.StreamResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -35,17 +35,18 @@ public class EmbeddedBrowserIsVisible extends TestBase {
         browser.setAlternateText("Browser alternative text");
         final TextSource textSource = new TextSource("initial");
         final StreamResource textResource = new StreamResource(textSource,
-                "initial.txt", this);
+                "initial.txt");
         textResource.setMIMEType("text/plain");
         browser.setSource(textResource);
         addComponent(browser);
 
         page1.addListener(new Button.ClickListener() {
 
+            @Override
             public void buttonClick(ClickEvent event) {
                 TextSource helloSource = new TextSource("Hello World");
                 StreamResource helloResource = new StreamResource(helloSource,
-                        "helloworld.txt", EmbeddedBrowserIsVisible.this);
+                        "helloworld.txt");
                 helloResource.setMIMEType("text/plain");
                 browser.setSource(helloResource);
             }
@@ -53,10 +54,11 @@ public class EmbeddedBrowserIsVisible extends TestBase {
 
         page2.addListener(new Button.ClickListener() {
 
+            @Override
             public void buttonClick(ClickEvent event) {
                 TextSource helloSource = new TextSource("Lorem Ipsum");
                 StreamResource helloResource = new StreamResource(helloSource,
-                        "loremipsum.txt", EmbeddedBrowserIsVisible.this);
+                        "loremipsum.txt");
                 helloResource.setMIMEType("text/plain");
                 browser.setSource(helloResource);
             }
@@ -64,6 +66,7 @@ public class EmbeddedBrowserIsVisible extends TestBase {
 
         page3.addListener(new Button.ClickListener() {
 
+            @Override
             public void buttonClick(ClickEvent event) {
                 browser.setSource(null);
             }
@@ -87,6 +90,7 @@ public class EmbeddedBrowserIsVisible extends TestBase {
             this.text = text;
         }
 
+        @Override
         public InputStream getStream() {
 
             StringBuilder sb = new StringBuilder();
diff --git a/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.html b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html
index 82834cf405..82834cf405 100644
--- a/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.html
+++ b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.java b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java
index 4d34f75ac9..23a4322fb7 100644
--- a/tests/testbench/com/vaadin/tests/components/flash/FlashIsVisible.java
+++ b/uitest/src/com/vaadin/tests/components/flash/FlashIsVisible.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.flash;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Flash;
 
diff --git a/tests/testbench/com/vaadin/tests/components/flash/FlashPresentation.java b/uitest/src/com/vaadin/tests/components/flash/FlashPresentation.java
index 843e61ace1..5c28feb7f8 100644
--- a/tests/testbench/com/vaadin/tests/components/flash/FlashPresentation.java
+++ b/uitest/src/com/vaadin/tests/components/flash/FlashPresentation.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.flash;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Flash;
 
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.html b/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
index 14dbc6d4c8..14dbc6d4c8 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.java b/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
index 4afe289825..4afe289825 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormCaptionClickFocusing.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html b/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
index 200ddb547d..200ddb547d 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java b/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
index 539263a363..539263a363 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html b/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
index 0d5b435609..0d5b435609 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java b/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
index 907b8a27f3..907b8a27f3 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormDescription.html b/uitest/src/com/vaadin/tests/components/form/FormDescription.html
index 7cf93c6125..7cf93c6125 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormDescription.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormDescription.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormDescription.java b/uitest/src/com/vaadin/tests/components/form/FormDescription.java
index 76ea039756..76ea039756 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormDescription.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormDescription.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormDescriptions.html b/uitest/src/com/vaadin/tests/components/form/FormDescriptions.html
index 1c6562ac52..1c6562ac52 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormDescriptions.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormDescriptions.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptions.java b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptions.java
index 25487fba7c..25487fba7c 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptions.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptions.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
index 10ebb37529..10ebb37529 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
index 863d4b5b80..863d4b5b80 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormFieldCaptionsStyles.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html b/uitest/src/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html
index c9d3dbef93..c9d3dbef93 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormFieldFactoryAndLayouts.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormNotGettingSmaller.java b/uitest/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java
index a47ab944a2..a47ab944a2 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormNotGettingSmaller.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java b/uitest/src/com/vaadin/tests/components/form/FormRenderingFlicker.java
index 41e1a91781..41e1a91781 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormRenderingFlicker.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormTest.java b/uitest/src/com/vaadin/tests/components/form/FormTest.java
index 604beb5fcc..604beb5fcc 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormTest.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java b/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java
index ed1a3d9bd9..ed1a3d9bd9 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortCut.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortcut.html b/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortcut.html
index 9680ef7022..9680ef7022 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortcut.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithEnterShortcut.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html b/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html
index 384cc6c398..384cc6c398 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java b/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java
index ff1951d9ca..ff1951d9ca 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithPaddingsAndBorders.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java b/uitest/src/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
index 24d207739e..24d207739e 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java b/uitest/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
index 17fe4477c3..17fe4477c3 100644
--- a/tests/testbench/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
+++ b/uitest/src/com/vaadin/tests/components/form/FormWithRelativelySizedLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
index ade84de312..ade84de312 100644
--- a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
+++ b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.html
diff --git a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
index b34db2170e..b34db2170e 100644
--- a/tests/testbench/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
+++ b/uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html
index 14b5cc4c53..14b5cc4c53 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html
+++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.html
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
index 0055c3782e..0055c3782e 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
+++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html
index 7733da4e95..7733da4e95 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html
+++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
index a73c88cf73..dc3cffffb6 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
+++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.components.formlayout;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.PopupDateField;
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayouts.java b/uitest/src/com/vaadin/tests/components/formlayout/FormLayouts.java
index f2c24feae5..f2c24feae5 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayouts.java
+++ b/uitest/src/com/vaadin/tests/components/formlayout/FormLayouts.java
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html b/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html
index 8795ad12dc..8795ad12dc 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java b/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
index 360c559086..360c559086 100644
--- a/tests/testbench/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
+++ b/uitest/src/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java b/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
index 165827eb6b..165827eb6b 100644
--- a/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
+++ b/uitest/src/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java
diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
index ed6d39f63d..ed6d39f63d 100644
--- a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
+++ b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentFromGridLayoutToInnerLayout.html
diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
index 0106f2e218..0106f2e218 100644
--- a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
+++ b/uitest/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.html b/uitest/src/com/vaadin/tests/components/image/ImageAltText.html
index 743aa5caaf..743aa5caaf 100644
--- a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.html
+++ b/uitest/src/com/vaadin/tests/components/image/ImageAltText.html
diff --git a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java b/uitest/src/com/vaadin/tests/components/image/ImageAltText.java
index 1f787fd64f..6abbc41213 100644
--- a/tests/testbench/com/vaadin/tests/components/image/ImageAltText.java
+++ b/uitest/src/com/vaadin/tests/components/image/ImageAltText.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.image;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -18,10 +18,10 @@ public class ImageAltText extends TestBase {
 
         Button changeAltTexts = new Button("Change alt text",
                 new Button.ClickListener() {
-            public void buttonClick(ClickEvent event) {
-                image.setAlternateText("New alt text!");
-            }
-        });
+                    public void buttonClick(ClickEvent event) {
+                        image.setAlternateText("New alt text!");
+                    }
+                });
         addComponent(changeAltTexts);
     }
 
diff --git a/tests/testbench/com/vaadin/tests/components/image/ImageClicks.html b/uitest/src/com/vaadin/tests/components/image/ImageClicks.html
index 14afaab98d..14afaab98d 100644
--- a/tests/testbench/com/vaadin/tests/components/image/ImageClicks.html
+++ b/uitest/src/com/vaadin/tests/components/image/ImageClicks.html
diff --git a/tests/testbench/com/vaadin/tests/components/image/ImageClicks.java b/uitest/src/com/vaadin/tests/components/image/ImageClicks.java
index 394e38a106..e2d983b7ce 100644
--- a/tests/testbench/com/vaadin/tests/components/image/ImageClicks.java
+++ b/uitest/src/com/vaadin/tests/components/image/ImageClicks.java
@@ -12,7 +12,7 @@ import javax.imageio.ImageIO;
 
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
-import com.vaadin.terminal.StreamResource;
+import com.vaadin.server.StreamResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Image;
 import com.vaadin.ui.Label;
@@ -30,10 +30,11 @@ public class ImageClicks extends TestBase {
         Image image = new Image();
         final MyImageSource imageSource = new MyImageSource();
         final StreamResource imageResource = new StreamResource(imageSource,
-                "testimage.png", this);
+                "testimage.png");
         image.setSource(imageResource);
         image.addListener(new ClickListener() {
 
+            @Override
             public void click(ClickEvent event) {
                 ++clickCounter;
                 label.setValue(labelText());
@@ -70,6 +71,7 @@ public class ImageClicks extends TestBase {
             return (int) Math.round(pos * resolution / (cells * 1.0));
         }
 
+        @Override
         public InputStream getStream() {
             // Create an image and draw some background on it.
             BufferedImage image = new BufferedImage(300, 300,
diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html
index 16e74aa485..8d0bb44cb5 100644
--- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html
+++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html
@@ -39,7 +39,7 @@
 <tr>
 	<td>assertText</td>
 	<td>vaadin=runcomvaadintestscomponentsjavascriptcomponentBasicJavaScriptComponent::/VVerticalLayout[0]/VVerticalLayout[0]/JavaScriptWidget[0]/domChild[0]</td>
-	<td>4. Url: /run/com.vaadin.tests.components.javascriptcomponent.BasicJavaScriptComponent/APP/1/test</td>
+	<td>4. Url: /run/com.vaadin.tests.components.javascriptcomponent.BasicJavaScriptComponent/APP/connector/1/12/test</td>
 </tr>
 <tr>
 	<td>assertText</td>
diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
index a0df85a5b3..38beca3bf1 100644
--- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
+++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java
@@ -22,13 +22,14 @@ import java.util.List;
 import com.vaadin.annotations.JavaScript;
 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
+import com.vaadin.server.DynamicConnectorResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ResourceReference;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.shared.communication.URLReference;
 import com.vaadin.shared.ui.JavaScriptComponentState;
-import com.vaadin.terminal.ClassResource;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.gwt.server.ResourceReference;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.AbstractJavaScriptComponent;
@@ -107,9 +108,8 @@ public class BasicJavaScriptComponent extends AbstractTestUI {
                     .setMessages(
                             Arrays.asList("First state message",
                                     "Second state message"));
-            ClassResource resource = new ClassResource("test",
-                    BasicJavaScriptComponent.this.getApplication());
-            getState().setUrl(new ResourceReference(resource));
+            Resource resource = new DynamicConnectorResource(this, "test");
+            getState().setUrl(new ResourceReference(resource, null, null));
         }
 
         @Override
diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js
index b0ece6217d..b0ece6217d 100644
--- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js
+++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js
diff --git a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html b/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
index 667f08ba4f..667f08ba4f 100644
--- a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
+++ b/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java b/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
index 61caf9a2f2..61caf9a2f2 100644
--- a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
+++ b/uitest/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelModes.html b/uitest/src/com/vaadin/tests/components/label/LabelModes.html
index 356688b456..356688b456 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelModes.html
+++ b/uitest/src/com/vaadin/tests/components/label/LabelModes.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/com/vaadin/tests/components/label/LabelModes.java
index 207a9a8de7..207a9a8de7 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelModes.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelModes.java
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTest.java b/uitest/src/com/vaadin/tests/components/label/LabelTest.java
index 186b3deeb3..186b3deeb3 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelTest.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip-chameleon.html b/uitest/src/com/vaadin/tests/components/label/LabelTooltip-chameleon.html
index 4a724795b3..4a724795b3 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/label/LabelTooltip-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip-runo.html b/uitest/src/com/vaadin/tests/components/label/LabelTooltip-runo.html
index 9877493b3b..9877493b3b 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip-runo.html
+++ b/uitest/src/com/vaadin/tests/components/label/LabelTooltip-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.html b/uitest/src/com/vaadin/tests/components/label/LabelTooltip.html
index 05da9195ef..05da9195ef 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.html
+++ b/uitest/src/com/vaadin/tests/components/label/LabelTooltip.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.java b/uitest/src/com/vaadin/tests/components/label/LabelTooltip.java
index 5ce19bcff8..bc399e7d3c 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelTooltip.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelTooltip.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.label;
 
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.html b/uitest/src/com/vaadin/tests/components/label/LabelWrapping.html
index b8038a75b4..b8038a75b4 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.html
+++ b/uitest/src/com/vaadin/tests/components/label/LabelWrapping.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java b/uitest/src/com/vaadin/tests/components/label/LabelWrapping.java
index 82969fdb08..82969fdb08 100644
--- a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java
+++ b/uitest/src/com/vaadin/tests/components/label/LabelWrapping.java
diff --git a/tests/testbench/com/vaadin/tests/components/label/Labels.html b/uitest/src/com/vaadin/tests/components/label/Labels.html
index 46ff066d8c..46ff066d8c 100644
--- a/tests/testbench/com/vaadin/tests/components/label/Labels.html
+++ b/uitest/src/com/vaadin/tests/components/label/Labels.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/Labels.java b/uitest/src/com/vaadin/tests/components/label/Labels.java
index 1da588576b..1da588576b 100644
--- a/tests/testbench/com/vaadin/tests/components/label/Labels.java
+++ b/uitest/src/com/vaadin/tests/components/label/Labels.java
diff --git a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.html b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.html
index 080200092d..080200092d 100644
--- a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.html
+++ b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.html
diff --git a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java
index 18d3b1e8ed..060c937feb 100644
--- a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java
+++ b/uitest/src/com/vaadin/tests/components/label/MarginsInLabels.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.label;
 
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractLayout;
 import com.vaadin.ui.Accordion;
diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkIcon.java b/uitest/src/com/vaadin/tests/components/link/LinkIcon.java
index ae8eccb59a..970c2f71c7 100644
--- a/tests/testbench/com/vaadin/tests/components/link/LinkIcon.java
+++ b/uitest/src/com/vaadin/tests/components/link/LinkIcon.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.link;
 
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Link;
 
diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkTargetSize.java b/uitest/src/com/vaadin/tests/components/link/LinkTargetSize.java
index 0b3643c3ac..822a8d5991 100644
--- a/tests/testbench/com/vaadin/tests/components/link/LinkTargetSize.java
+++ b/uitest/src/com/vaadin/tests/components/link/LinkTargetSize.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.link;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Link;
 
diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.html b/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.html
index 7dff317288..7dff317288 100644
--- a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.html
+++ b/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.html
diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java b/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.java
index f14e1afd8c..770ff9895a 100644
--- a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java
+++ b/uitest/src/com/vaadin/tests/components/link/LinkToPercentage.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.link;
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.vaadin.terminal.ApplicationResource;
-import com.vaadin.terminal.StreamResource;
-import com.vaadin.terminal.StreamResource.StreamSource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.StreamResource;
+import com.vaadin.server.StreamResource.StreamSource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Link;
 
@@ -14,7 +14,7 @@ public class LinkToPercentage extends TestBase {
     @Override
     protected void setup() {
         String filename = "110% Vaadin";
-        ApplicationResource resource = new StreamResource(new StreamSource() {
+        Resource resource = new StreamResource(new StreamSource() {
             @Override
             public InputStream getStream() {
                 return new InputStream() {
@@ -31,8 +31,7 @@ public class LinkToPercentage extends TestBase {
                     }
                 };
             }
-        }, filename, this);
-        addResource(resource);
+        }, filename);
 
         Link link = new Link("The link", resource);
 
diff --git a/tests/testbench/com/vaadin/tests/components/listselect/ListSelectSelection.html b/uitest/src/com/vaadin/tests/components/listselect/ListSelectSelection.html
index 9820e044f7..9820e044f7 100644
--- a/tests/testbench/com/vaadin/tests/components/listselect/ListSelectSelection.html
+++ b/uitest/src/com/vaadin/tests/components/listselect/ListSelectSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java b/uitest/src/com/vaadin/tests/components/listselect/ListSelects.java
index a3fa973bc2..a3fa973bc2 100644
--- a/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java
+++ b/uitest/src/com/vaadin/tests/components/listselect/ListSelects.java
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html b/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
index 5a2a0d839a..5a2a0d839a 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
+++ b/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java b/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
index 3fde281c20..3fde281c20 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
+++ b/uitest/src/com/vaadin/tests/components/loginform/CustomizedLoginFormTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled b/uitest/src/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled
index 075bb3c57f..075bb3c57f 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.html b/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.html
index daaefab48c..daaefab48c 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.html
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java b/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.java
index 629edc2130..629edc2130 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html b/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html
index 9a80ce6013..9a80ce6013 100755
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.html
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java b/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
index b3ebb02751..b3ebb02751 100755
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormUIInLoginHandler.java
diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
index 480c186df7..ac4c3c8ea3 100644
--- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
+++ b/uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.loginform;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.LoginForm;
 import com.vaadin.ui.LoginForm.LoginEvent;
 import com.vaadin.ui.LoginForm.LoginListener;
diff --git a/tests/testbench/com/vaadin/tests/components/media/Media.java b/uitest/src/com/vaadin/tests/components/media/Media.java
index ef7fc36c63..945285fbb4 100644
--- a/tests/testbench/com/vaadin/tests/components/media/Media.java
+++ b/uitest/src/com/vaadin/tests/components/media/Media.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.components.media;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Audio;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java b/uitest/src/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
index c303aaf5a9..c303aaf5a9 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/HiddenAndDisabledMenus.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html b/uitest/src/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
index dfb74f9d34..dfb74f9d34 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/IconsInRootMenuBar.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/IconsInSubMenus.html b/uitest/src/com/vaadin/tests/components/menubar/IconsInSubMenus.html
index 87f6f7a65e..87f6f7a65e 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/IconsInSubMenus.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/IconsInSubMenus.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
index 2878018752..2878018752 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
index d7585af8ac..d6e79224a3 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.menubar;
 import java.util.Arrays;
 import java.util.List;
 
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.MenuBar;
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
index 59aebd0bd7..59aebd0bd7 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
index ebdfa81f20..ebdfa81f20 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarLongMenus.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
index 7170a98325..7170a98325 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarLongMenus.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java
index 3af07645d6..3af07645d6 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigation.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
index a3d7700dae..a3d7700dae 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationKeyboard.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
index 421966876b..421966876b 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarNavigationMouse.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarResize.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarResize.html
index 97006323a2..97006323a2 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarResize.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarResize.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
index a53757a969..a53757a969 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
index c093a61812..c093a61812 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
index 63f6ff7753..63f6ff7753 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
index 2c4a975f9b..c88edf5bdc 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.menubar;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.MenuBar;
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarTest.java
index 5ab2b2145f..982b16c6e2 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarTest.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.menubar;
 import java.util.Date;
 import java.util.LinkedHashMap;
 
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.AbstractComponentTest;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.MenuItem;
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.html
index f7c57baf1f..f7c57baf1f 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.java
index 0ef31dc5dc..0ef31dc5dc 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarToolTips.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarToolTips.java
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/Menubars.html b/uitest/src/com/vaadin/tests/components/menubar/Menubars.html
index 93d77f9f36..93d77f9f36 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/Menubars.html
+++ b/uitest/src/com/vaadin/tests/components/menubar/Menubars.html
diff --git a/tests/testbench/com/vaadin/tests/components/menubar/Menubars.java b/uitest/src/com/vaadin/tests/components/menubar/Menubars.java
index 40e566194a..40e566194a 100644
--- a/tests/testbench/com/vaadin/tests/components/menubar/Menubars.java
+++ b/uitest/src/com/vaadin/tests/components/menubar/Menubars.java
diff --git a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
index 5f80004c7c..5f80004c7c 100644
--- a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
+++ b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonDisableOnClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html
index 8a1b21c35d..8a1b21c35d 100644
--- a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html
+++ b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.html
diff --git a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
index 94023db2d0..94023db2d0 100644
--- a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
+++ b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java
diff --git a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonTest.java b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
index 7b1e75a3da..7b1e75a3da 100644
--- a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
+++ b/uitest/src/com/vaadin/tests/components/nativebutton/NativeButtonTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java b/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelects.java
index 80b088f03a..80b088f03a 100644
--- a/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java
+++ b/uitest/src/com/vaadin/tests/components/nativeselect/NativeSelects.java
diff --git a/tests/testbench/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html b/uitest/src/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
index 1ab75e1176..1ab75e1176 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
+++ b/uitest/src/com/vaadin/tests/components/notification/CloseErrorNotificationWithEscape.html
diff --git a/tests/testbench/com/vaadin/tests/components/notification/Notifications.html b/uitest/src/com/vaadin/tests/components/notification/Notifications.html
index c9016cfd6f..c9016cfd6f 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/Notifications.html
+++ b/uitest/src/com/vaadin/tests/components/notification/Notifications.html
diff --git a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java b/uitest/src/com/vaadin/tests/components/notification/Notifications.java
index 97e038dc1a..10fef434ca 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java
+++ b/uitest/src/com/vaadin/tests/components/notification/Notifications.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.notification;
 
-import com.vaadin.terminal.Page;
+import com.vaadin.server.Page;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html b/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html
index 35d22da46e..35d22da46e 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html
+++ b/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java b/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
index 25bc05c771..25bc05c771 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
+++ b/uitest/src/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html b/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
index 455952fb71..455952fb71 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
+++ b/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
index 767d16b6da..89e97c0b6a 100644
--- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
+++ b/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.notification;
 
-import com.vaadin.terminal.Page;
+import com.vaadin.server.Page;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/notification/SemiTransparentNotification.java b/uitest/src/com/vaadin/tests/components/notification/SemiTransparentNotification.java
index 8fefac16a1..1745c11982 100755
--- a/tests/testbench/com/vaadin/tests/components/notification/SemiTransparentNotification.java
+++ b/uitest/src/com/vaadin/tests/components/notification/SemiTransparentNotification.java
@@ -12,7 +12,8 @@ public class SemiTransparentNotification extends TestBase {
         Label l = new Label(LoremIpsum.get(10000));
         getLayout().setSizeFull();
         addComponent(l);
-        Notification.show("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This should be a <br/><b>SEMI-TRANSPARENT</b><br/> notification",
+        Notification
+                .show("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This should be a <br/><b>SEMI-TRANSPARENT</b><br/> notification",
                         Notification.TYPE_WARNING_MESSAGE);
     }
 
diff --git a/tests/testbench/com/vaadin/tests/components/notification/SemitransparentNotification.html b/uitest/src/com/vaadin/tests/components/notification/SemitransparentNotification.html
index f125b98ee1..f125b98ee1 100755
--- a/tests/testbench/com/vaadin/tests/components/notification/SemitransparentNotification.html
+++ b/uitest/src/com/vaadin/tests/components/notification/SemitransparentNotification.html
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html b/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
index 01c033e4fa..01c033e4fa 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.html
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java b/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
index 877f9aa675..877f9aa675 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html b/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
index d74354299d..d74354299d 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.html
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java b/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
index 179d1aa5ff..179d1aa5ff 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
index 978d911a2d..978d911a2d 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupItemIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
index 213258ed29..213258ed29 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroups.java
index c20de87ec7..c4c588d1ea 100644
--- a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java
+++ b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroups.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.optiongroup;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.select.AbstractSelectTestCase;
 import com.vaadin.ui.OptionGroup;
 
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
index fd6ecf5422..fd6ecf5422 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
index f0fd1568b1..f0fd1568b1 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
index 821a5dbb93..821a5dbb93 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
index c52543d6f2..ea3b319c5c 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.orderedlayout;
 
+import com.vaadin.server.ThemeResource;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html
index 9e1400521b..9e1400521b 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.html
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
index a10e69e188..e029e3903a 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
@@ -8,7 +8,7 @@ import java.util.List;
 import com.vaadin.annotations.Theme;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.ui.AbstractOrderedLayout;
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html b/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
index 7a071030dc..7a071030dc 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java b/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
index a18400ce08..a18400ce08 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
index 8b6a8d7d26..8b6a8d7d26 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutChangingChildrenSizes.html
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
index 2298364c3f..2298364c3f 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
index f0d837d97a..f0d837d97a 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.html
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
index bc76a0c0ce..bc76a0c0ce 100644
--- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
diff --git a/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java b/uitest/src/com/vaadin/tests/components/panel/BasicPanelTest.java
index b3eac5c82e..b3eac5c82e 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java
+++ b/uitest/src/com/vaadin/tests/components/panel/BasicPanelTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.html b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.html
index bff19c4846..bff19c4846 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.html
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.html
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java
index a4067c3dcb..fd96b08cfb 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelChangeContents.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.components.panel;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html b/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
index 4b71c5a9a9..4b71c5a9a9 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java b/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
index 40f6d5ea33..40f6d5ea33 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.html b/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
index 8b03ca330f..8b03ca330f 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.html
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java b/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
index a4cba89732..a4cba89732 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/uitest/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
index 5ca5c5135f..5ca5c5135f 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelTest.java b/uitest/src/com/vaadin/tests/components/panel/PanelTest.java
index 29d93ce86c..29d93ce86c 100644
--- a/tests/testbench/com/vaadin/tests/components/panel/PanelTest.java
+++ b/uitest/src/com/vaadin/tests/components/panel/PanelTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html b/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
index ed671c9104..ed671c9104 100644
--- a/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
+++ b/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldBasicStates.html
diff --git a/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java b/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
index a256438494..a256438494 100644
--- a/tests/testbench/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
index c52bfa634d..c52bfa634d 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
index ba4fe93b68..ba4fe93b68 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewLabelResized.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
index 2776c63e9f..2776c63e9f 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewLabelResized.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java
index 75f95977bd..75f95977bd 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
index 99ee864179..99ee864179 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
index 01ed34a13f..01ed34a13f 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
index fb62215f16..fb62215f16 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.html
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
index 271a7eea2a..271a7eea2a 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
index 069ccef2bb..069ccef2bb 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.html b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.html
index a8d1407005..a8d1407005 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.html
+++ b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.html
diff --git a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java
index 99bfc7acfb..d755f5961e 100644
--- a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java
+++ b/uitest/src/com/vaadin/tests/components/popupview/ReopenPopupView.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.components.popupview;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java b/uitest/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
index 9f632ac806..9f632ac806 100644
--- a/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
+++ b/uitest/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html
index be1c5a2cde..be1c5a2cde 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
index f88ed0c67c..f88ed0c67c 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
index 7708c88e54..7708c88e54 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
index 934f2ed2dd..934f2ed2dd 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
index 4155dd8a07..4155dd8a07 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
index 6eaffa5cf3..e775bf6aca 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.richtextarea;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ShortcutAction;
-import com.vaadin.terminal.Page;
+import com.vaadin.server.Page;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.html b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.html
index 7d96b4185f..7d96b4185f 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.html
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.html
diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.java b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java
index 8585d19bc2..8585d19bc2 100644
--- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreas.java
+++ b/uitest/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/uitest/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java
index 7c2d8dd243..b0c6c08a62 100644
--- a/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java
+++ b/uitest/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java
@@ -11,7 +11,7 @@ import com.vaadin.event.Action;
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.event.ItemClickEvent.ItemClickNotifier;
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.Resource;
 import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
 import com.vaadin.ui.AbstractSelect;
 
diff --git a/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java b/uitest/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
index 470c97442f..470c97442f 100644
--- a/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
+++ b/uitest/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java b/uitest/src/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
index 6f203bf8c9..6f203bf8c9 100644
--- a/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
+++ b/uitest/src/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.html b/uitest/src/com/vaadin/tests/components/select/NativeSelects.html
index f9ab8eb3a0..f9ab8eb3a0 100644
--- a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.html
+++ b/uitest/src/com/vaadin/tests/components/select/NativeSelects.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java b/uitest/src/com/vaadin/tests/components/select/NativeSelects.java
index 75a3f1b751..75a3f1b751 100644
--- a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java
+++ b/uitest/src/com/vaadin/tests/components/select/NativeSelects.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java b/uitest/src/com/vaadin/tests/components/select/NullSelectionItemId.java
index 984bab5b34..984bab5b34 100644
--- a/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java
+++ b/uitest/src/com/vaadin/tests/components/select/NullSelectionItemId.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.html b/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
index 122e90e140..122e90e140 100644
--- a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
+++ b/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java b/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
index 77c187ff60..77c187ff60 100644
--- a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
+++ b/uitest/src/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.html b/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.html
index 90e2e293a3..90e2e293a3 100644
--- a/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.html
+++ b/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.java b/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.java
index 51a899a7e6..0cba74b941 100644
--- a/tests/testbench/com/vaadin/tests/components/select/SelectIconPlacement.java
+++ b/uitest/src/com/vaadin/tests/components/select/SelectIconPlacement.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.select;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Select;
 
diff --git a/uitest/src/com/vaadin/tests/components/select/SelectTest.java b/uitest/src/com/vaadin/tests/components/select/SelectTest.java
new file mode 100644
index 0000000000..f19e7ecad2
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/select/SelectTest.java
@@ -0,0 +1,14 @@
+package com.vaadin.tests.components.select;
+
+import com.vaadin.tests.components.combobox.ComboBoxes2;
+import com.vaadin.ui.Select;
+
+public class SelectTest extends ComboBoxes2<Select> {
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected Class<Select> getTestClass() {
+        return Select.class;
+    }
+
+}
diff --git a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.html b/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.html
index 48adf2edfe..48adf2edfe 100644
--- a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.html
+++ b/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java b/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.java
index b97231ae8e..b97231ae8e 100644
--- a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java
+++ b/uitest/src/com/vaadin/tests/components/select/StylingPopupOpener.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html b/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
index c2b55a5229..c2b55a5229 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java b/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
index 789174260f..789174260f 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html b/uitest/src/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
index bdb7121675..bdb7121675 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelectDualCaptions.html
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java b/uitest/src/com/vaadin/tests/components/select/TwinColSelectTest.java
index b27dfa0ec8..b27dfa0ec8 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelectTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelects.java b/uitest/src/com/vaadin/tests/components/select/TwinColSelects.java
index 64b3d37c0d..64b3d37c0d 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelects.java
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelects.java
diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html b/uitest/src/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
index aa217d97cf..aa217d97cf 100644
--- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
+++ b/uitest/src/com/vaadin/tests/components/select/TwinColSelectsDisabledReadonly.html
diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.html b/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
index 0521506418..0521506418 100644
--- a/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.html
diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.java b/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
index fe9450a0f0..fe9450a0f0 100644
--- a/tests/testbench/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderKeyboardFocus.java
diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderOrientation.html b/uitest/src/com/vaadin/tests/components/slider/SliderOrientation.html
index 174ddca016..174ddca016 100644
--- a/tests/testbench/com/vaadin/tests/components/slider/SliderOrientation.html
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderOrientation.html
diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java b/uitest/src/com/vaadin/tests/components/slider/SliderTest.java
index 0b9c2d6c5a..0b9c2d6c5a 100644
--- a/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderTooltip.html b/uitest/src/com/vaadin/tests/components/slider/SliderTooltip.html
index 4e8296050f..4e8296050f 100644
--- a/tests/testbench/com/vaadin/tests/components/slider/SliderTooltip.html
+++ b/uitest/src/com/vaadin/tests/components/slider/SliderTooltip.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java b/uitest/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
index dc361b1b27..7c0648876b 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.splitpanel;
 
-import com.vaadin.terminal.Sizeable;
-import com.vaadin.terminal.Sizeable.Unit;
+import com.vaadin.server.Sizeable;
+import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.tests.components.AbstractComponentContainerTest;
 import com.vaadin.ui.AbstractSplitPanel;
 import com.vaadin.ui.AbstractSplitPanel.SplitterClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
index 82229773d0..82229773d0 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
index b2deb8e509..b2deb8e509 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelMoveSplitter.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
index d91b3d8c4a..d91b3d8c4a 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelSplitterClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
index a330581f22..a330581f22 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/HorizontalSplitPanels.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
index e8e7395198..e8e7395198 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
index 5554b2b9f3..342cd9de6c 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.splitpanel;
 
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
index c06ca5b0b9..a1d0fcb42b 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelInModalWindow.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.splitpanel;
 
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.VerticalLayout;
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
index 6bdc9dd5e7..6bdc9dd5e7 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
index a86d209f65..18ea015d01 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.splitpanel;
 
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractSplitPanel.SplitterClickEvent;
 import com.vaadin.ui.AbstractSplitPanel.SplitterClickListener;
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
index 08e602241f..08e602241f 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
index f84eba7c36..f84eba7c36 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
index 26abd0a782..26abd0a782 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
index 3cdc0c8913..c35838e751 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.splitpanel;
 
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.HorizontalSplitPanel;
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html
index 70d619edac..70d619edac 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
index 2a730da9be..beebbf4d2a 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.splitpanel;
 
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
index 6b17319509..6b17319509 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
index cf67caccb7..cf67caccb7 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
index 7c8cd6ad12..7c8cd6ad12 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelMoveSplitter.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
index cc384b6de6..cc384b6de6 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanelSplitterClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
index 219a72c196..219a72c196 100644
--- a/tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
+++ b/uitest/src/com/vaadin/tests/components/splitpanel/VerticalSplitPanels.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ActionsOnTableBackground.html b/uitest/src/com/vaadin/tests/components/table/ActionsOnTableBackground.html
index 93037c3da1..93037c3da1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ActionsOnTableBackground.html
+++ b/uitest/src/com/vaadin/tests/components/table/ActionsOnTableBackground.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.html b/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.html
index 7f4845d1a9..7f4845d1a9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java b/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.java
index bde50af013..bde50af013 100644
--- a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/AddItemToEmptyTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.html b/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.html
index ba1e177235..ba1e177235 100644
--- a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.html
+++ b/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java b/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.java
index 80b136d2ab..80b136d2ab 100644
--- a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java
+++ b/uitest/src/com/vaadin/tests/components/table/AddNonRenderedRow.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java b/uitest/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
index 35f35c1407..35f35c1407 100644
--- a/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.html b/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html
index 4a6ccbbe2d..4a6ccbbe2d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.java b/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.java
index 6b8532a9ad..6b8532a9ad 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ClippedComponentsInTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/ClippedComponentsInTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html b/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
index e3d0821642..e3d0821642 100644
--- a/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
+++ b/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java b/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
index 267b61854f..267b61854f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
+++ b/uitest/src/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html b/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
index 9e529836b6..9e529836b6 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
index 08b65e2ef5..08b65e2ef5 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.html b/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.html
index 6d5422831e..6d5422831e 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.html
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.java b/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.java
index be176d83fa..be176d83fa 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandRatio.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnExpandRatio.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html b/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
index eb338c8dde..eb338c8dde 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java b/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
index 78b6c0982c..78b6c0982c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java b/uitest/src/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
index 2898750113..2898750113 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java b/uitest/src/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
index 324d1a63cf..324d1a63cf 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java b/uitest/src/com/vaadin/tests/components/table/ColumnReorderEvent.java
index f32633eece..f32633eece 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnReorderEvent.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java b/uitest/src/com/vaadin/tests/components/table/ColumnResizeEvent.java
index f092ba8bca..f092ba8bca 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnResizeEvent.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnWidths.java b/uitest/src/com/vaadin/tests/components/table/ColumnWidths.java
index 9fe7a98179..9fe7a98179 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ColumnWidths.java
+++ b/uitest/src/com/vaadin/tests/components/table/ColumnWidths.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html b/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
index 6c8a770b6a..6c8a770b6a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
+++ b/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java b/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
index c76edca40d..c76edca40d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
+++ b/uitest/src/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.html b/uitest/src/com/vaadin/tests/components/table/ContainerSizeChange.html
index 7c2374f322..7c2374f322 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.html
+++ b/uitest/src/com/vaadin/tests/components/table/ContainerSizeChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java b/uitest/src/com/vaadin/tests/components/table/ContainerSizeChange.java
index c24be6de96..c24be6de96 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java
+++ b/uitest/src/com/vaadin/tests/components/table/ContainerSizeChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/CtrlShiftMultiselect.java b/uitest/src/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
index b9e23930e4..b9e23930e4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
+++ b/uitest/src/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html b/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
index a8f0e864c3..a8f0e864c3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
+++ b/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java b/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
index ec888c2699..ec888c2699 100644
--- a/tests/testbench/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
+++ b/uitest/src/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java b/uitest/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
index c52f57358c..c52f57358c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
+++ b/uitest/src/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java b/uitest/src/com/vaadin/tests/components/table/DoublesInTable.java
index 920ccc2038..920ccc2038 100644
--- a/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/DoublesInTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.html b/uitest/src/com/vaadin/tests/components/table/EditableModeChange.html
index 6414c9bc03..6414c9bc03 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.html
+++ b/uitest/src/com/vaadin/tests/components/table/EditableModeChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java b/uitest/src/com/vaadin/tests/components/table/EditableModeChange.java
index 5db294088a..5db294088a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java
+++ b/uitest/src/com/vaadin/tests/components/table/EditableModeChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableTableFocus.java b/uitest/src/com/vaadin/tests/components/table/EditableTableFocus.java
index b5c8aa0296..b5c8aa0296 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EditableTableFocus.java
+++ b/uitest/src/com/vaadin/tests/components/table/EditableTableFocus.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java b/uitest/src/com/vaadin/tests/components/table/EditableTableLeak.java
index 26ac23d5be..26ac23d5be 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java
+++ b/uitest/src/com/vaadin/tests/components/table/EditableTableLeak.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/EmptyTable.html b/uitest/src/com/vaadin/tests/components/table/EmptyTable.html
index 7196771f56..7196771f56 100644
--- a/tests/testbench/com/vaadin/tests/components/table/EmptyTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/EmptyTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.html b/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.html
index fb8f7c8b7f..fb8f7c8b7f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.java b/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.java
index 174c166320..174c166320 100644
--- a/tests/testbench/com/vaadin/tests/components/table/FixedHeightTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/FixedHeightTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/Footer.html b/uitest/src/com/vaadin/tests/components/table/Footer.html
index dbbdef2f9c..dbbdef2f9c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/Footer.html
+++ b/uitest/src/com/vaadin/tests/components/table/Footer.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/Footer.java b/uitest/src/com/vaadin/tests/components/table/Footer.java
index 7fd8d3563f..7fd8d3563f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/Footer.java
+++ b/uitest/src/com/vaadin/tests/components/table/Footer.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/FooterClick.html b/uitest/src/com/vaadin/tests/components/table/FooterClick.html
index fb3d004620..fb3d004620 100644
--- a/tests/testbench/com/vaadin/tests/components/table/FooterClick.html
+++ b/uitest/src/com/vaadin/tests/components/table/FooterClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java b/uitest/src/com/vaadin/tests/components/table/FooterClick.java
index 992b521b60..992b521b60 100644
--- a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java
+++ b/uitest/src/com/vaadin/tests/components/table/FooterClick.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.html b/uitest/src/com/vaadin/tests/components/table/HeaderClick.html
index d5328b25d3..d5328b25d3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.html
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderClick.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java b/uitest/src/com/vaadin/tests/components/table/HeaderClick.java
index b335e34d84..b335e34d84 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderClick.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html b/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
index dfd001bf5c..dfd001bf5c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java b/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
index ec82b36575..ec82b36575 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html b/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
index c3128820ef..c3128820ef 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderPositionWhenSorting.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderSyncOnScroll.html b/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
index 66f6107f90..66f6107f90 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderSyncOnScroll.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html b/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
index ef2067fbf5..ef2067fbf5 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
index 6dafdd3dd5..6dafdd3dd5 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
+++ b/uitest/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java b/uitest/src/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
index 4a729d221f..4a729d221f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
+++ b/uitest/src/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html b/uitest/src/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html
index 98629252d9..98629252d9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html
+++ b/uitest/src/com/vaadin/tests/components/table/HorizontalScrollWithNoRows.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java b/uitest/src/com/vaadin/tests/components/table/HugeRowCount.java
index 434d650d6d..434d650d6d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java
+++ b/uitest/src/com/vaadin/tests/components/table/HugeRowCount.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.html b/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.html
index 1d7b2b6bf9..1d7b2b6bf9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.html
+++ b/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java b/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.java
index 4fca8c1742..828d184086 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java
+++ b/uitest/src/com/vaadin/tests/components/table/ItemClickEvents.java
@@ -4,7 +4,7 @@ import com.vaadin.data.Item;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/components/table/KeyControl.java b/uitest/src/com/vaadin/tests/components/table/KeyControl.java
index 2998940db1..2998940db1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/KeyControl.java
+++ b/uitest/src/com/vaadin/tests/components/table/KeyControl.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java b/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
index b389727fd3..b389727fd3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
+++ b/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationDatasourceChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
index bc0601684f..f9a0add6fc 100644
--- a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
+++ b/uitest/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.table;
 import java.util.Arrays;
 
 import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html b/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
index 62e3786a44..62e3786a44 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
index b9e7fde17a..99ad913674 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.table;
 import com.vaadin.data.Item;
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Embedded;
diff --git a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.html b/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.html
index 441142e7f9..441142e7f9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.html
+++ b/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java b/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.java
index b7379b4f2c..b7379b4f2c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java
+++ b/uitest/src/com/vaadin/tests/components/table/LastColumnNegative.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.html b/uitest/src/com/vaadin/tests/components/table/LongMultiselect.html
index 82778d5bac..82778d5bac 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.html
+++ b/uitest/src/com/vaadin/tests/components/table/LongMultiselect.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java b/uitest/src/com/vaadin/tests/components/table/LongMultiselect.java
index 43a89e4211..43a89e4211 100644
--- a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java
+++ b/uitest/src/com/vaadin/tests/components/table/LongMultiselect.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.html b/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.html
index e1f783d42f..e1f783d42f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.html
+++ b/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java b/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.java
index e51cec2a6d..e51cec2a6d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java
+++ b/uitest/src/com/vaadin/tests/components/table/MissingScrollbar.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.html b/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.html
index 33318c9a95..33318c9a95 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.html
+++ b/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java b/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.java
index 00965220db..00965220db 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java
+++ b/uitest/src/com/vaadin/tests/components/table/ModifyContainerProperty.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java b/uitest/src/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
index 0e440a95d0..0e440a95d0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectValueOrder.html b/uitest/src/com/vaadin/tests/components/table/MultiSelectValueOrder.html
index 4bac7741da..4bac7741da 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MultiSelectValueOrder.html
+++ b/uitest/src/com/vaadin/tests/components/table/MultiSelectValueOrder.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
index 06deb98f7f..06deb98f7f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
+++ b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html
index c41f3fbfdd..c41f3fbfdd 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html
+++ b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
index 12ae4a3c4d..12ae4a3c4d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
+++ b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/NotselectablePaintSelections.java b/uitest/src/com/vaadin/tests/components/table/NotselectablePaintSelections.java
index cb609b856b..cb609b856b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/NotselectablePaintSelections.java
+++ b/uitest/src/com/vaadin/tests/components/table/NotselectablePaintSelections.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.html b/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.html
index 525ad34888..525ad34888 100644
--- a/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.html
+++ b/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.java b/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.java
index f6c70f4ffe..f6c70f4ffe 100644
--- a/tests/testbench/com/vaadin/tests/components/table/OddEvenRowStyling.java
+++ b/uitest/src/com/vaadin/tests/components/table/OddEvenRowStyling.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html b/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html
index 8d185b6219..8d185b6219 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html
+++ b/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java b/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
index 0b5b1d139c..0b5b1d139c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
+++ b/uitest/src/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.html b/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.html
index 71d323cdc0..71d323cdc0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.html
+++ b/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java b/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.java
index e85bfc55a7..e85bfc55a7 100644
--- a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java
+++ b/uitest/src/com/vaadin/tests/components/table/PropertyValueChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html b/uitest/src/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
index 7e7536d63a..7e7536d63a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/table/ResizeColumnAfterScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java b/uitest/src/com/vaadin/tests/components/table/RowAdditionTest.java
index c6d071f34c..c6d071f34c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/RowAdditionTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java b/uitest/src/com/vaadin/tests/components/table/RowGenerators.java
index c3bf46c12d..c3bf46c12d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java
+++ b/uitest/src/com/vaadin/tests/components/table/RowGenerators.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html b/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html
index 65487d8fa8..65487d8fa8 100644
--- a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html
+++ b/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java b/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
index a9d5869e5f..a9d5869e5f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
+++ b/uitest/src/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java b/uitest/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
index dffab6dbad..6f4436880a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
+++ b/uitest/src/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Panel;
diff --git a/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java b/uitest/src/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
index edd524d657..edd524d657 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
+++ b/uitest/src/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java b/uitest/src/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
index 9423968ecf..9423968ecf 100644
--- a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
+++ b/uitest/src/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.html b/uitest/src/com/vaadin/tests/components/table/SelectableEditable.html
index 8d46523c40..8d46523c40 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.html
+++ b/uitest/src/com/vaadin/tests/components/table/SelectableEditable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.java b/uitest/src/com/vaadin/tests/components/table/SelectableEditable.java
index 2b33c71d2a..2b33c71d2a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.java
+++ b/uitest/src/com/vaadin/tests/components/table/SelectableEditable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java b/uitest/src/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
index d9401c21b4..d9401c21b4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
+++ b/uitest/src/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectionRangeDragging.html b/uitest/src/com/vaadin/tests/components/table/SelectionRangeDragging.html
index 1e911699d1..1e911699d1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SelectionRangeDragging.html
+++ b/uitest/src/com/vaadin/tests/components/table/SelectionRangeDragging.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
index aebb494247..aebb494247 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
+++ b/uitest/src/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.html b/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.html
index 51f13af004..51f13af004 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.java b/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.java
index cbe06b8f7d..cbe06b8f7d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SortLabelsInTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/SortLabelsInTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.html b/uitest/src/com/vaadin/tests/components/table/SortLongTable.html
index 96513509e1..96513509e1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.html
+++ b/uitest/src/com/vaadin/tests/components/table/SortLongTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java b/uitest/src/com/vaadin/tests/components/table/SortLongTable.java
index afc63c0eda..afc63c0eda 100644
--- a/tests/testbench/com/vaadin/tests/components/table/SortLongTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/SortLongTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java b/uitest/src/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
index 18eec814bc..039b02e801 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
@@ -6,7 +6,7 @@ import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.event.Action;
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java b/uitest/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
index 75f2679234..75f2679234 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html b/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html
index 7ad0873c0f..7ad0873c0f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
index 38b3a751e2..62a131cbbf 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
@@ -7,8 +7,8 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html b/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html
index 5b50eeba23..5b50eeba23 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java b/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
index a37cf48579..a37cf48579 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnAlignment.html b/uitest/src/com/vaadin/tests/components/table/TableColumnAlignment.html
index 49bb86dbce..49bb86dbce 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnAlignment.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnAlignment.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnHeaders.html b/uitest/src/com/vaadin/tests/components/table/TableColumnHeaders.html
index 9f4e6cb8da..9f4e6cb8da 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnHeaders.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnHeaders.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html
index a9a572e468..a9a572e468 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons-runo.html b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-runo.html
index 641d9480ca..641d9480ca 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons-runo.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons.html b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons.html
index 81b8be89fa..81b8be89fa 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnIcons.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html b/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html
index 9c8a12fe15..9c8a12fe15 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java b/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
index 0b695b41c7..0b695b41c7 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnSorting.html b/uitest/src/com/vaadin/tests/components/table/TableColumnSorting.html
index 7f6ee1a975..7f6ee1a975 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableColumnSorting.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableColumnSorting.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java b/uitest/src/com/vaadin/tests/components/table/TableContextMenu.java
index 9416ffe70c..9416ffe70c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableContextMenu.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuAndIcons.html b/uitest/src/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
index 82f1e63d6b..82f1e63d6b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableContextMenuAndIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java b/uitest/src/com/vaadin/tests/components/table/TableContextMenuOnField.java
index 3b639be21f..3b639be21f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableContextMenuOnField.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableDragColumn.html b/uitest/src/com/vaadin/tests/components/table/TableDragColumn.html
index 7c2dc2813c..7c2dc2813c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableDragColumn.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableDragColumn.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java b/uitest/src/com/vaadin/tests/components/table/TableExtraScrollbars.java
index f8fb624c0b..f8fb624c0b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableExtraScrollbars.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableExtraScrollbars.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java b/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java
index 90df5610eb..90df5610eb 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableFirstRowFlicker.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedColumns.html b/uitest/src/com/vaadin/tests/components/table/TableGeneratedColumns.html
index 19326e9f12..19326e9f12 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedColumns.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableGeneratedColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html b/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html
index 8a83f27701..8a83f27701 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedRows.html b/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows.html
index 35a600765f..35a600765f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedRows.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableGeneratedRows.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedStringColumns.html b/uitest/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
index 4d5f4c2d17..4d5f4c2d17 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableGeneratedStringColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeaderShifting.java b/uitest/src/com/vaadin/tests/components/table/TableHeaderShifting.java
index 9dc641ddc4..9dc641ddc4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableHeaderShifting.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableHeaderShifting.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java b/uitest/src/com/vaadin/tests/components/table/TableHeaderZoom.java
index 26f8e25d3b..26f8e25d3b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableHeaderZoom.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html b/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
index 01b2c578f0..01b2c578f0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
index 6bbf06635a..6bbf06635a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java b/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java
index f54f685a1d..1c6862cf07 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableInTabsheet.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.table;
 
 import java.net.MalformedURLException;
 
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java b/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
index e7176add0a..e7176add0a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableItemIcon.java b/uitest/src/com/vaadin/tests/components/table/TableItemIcon.java
index b8a6733e83..1faa9667c2 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableItemIcon.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableItemIcon.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.table;
 
 import com.vaadin.data.Item;
-import com.vaadin.terminal.ClassResource;
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.ClassResource;
+import com.vaadin.server.Resource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Table;
 
@@ -27,11 +27,9 @@ public class TableItemIcon extends TestBase {
         getLayout().addComponent(table);
 
         Item item = table.addItem("FI");
-        item.getItemProperty("icon").setValue(
-                new ClassResource("fi.gif", TableItemIcon.this));
+        item.getItemProperty("icon").setValue(new ClassResource("fi.gif"));
         item = table.addItem("SE");
-        item.getItemProperty("icon").setValue(
-                new ClassResource("se.gif", TableItemIcon.this));
+        item.getItemProperty("icon").setValue(new ClassResource("se.gif"));
 
     }
 
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.html b/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.html
index ca8ee6d6a4..ca8ee6d6a4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.java b/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.java
index 18d13e676b..18d13e676b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableLastRowMissing.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableLastRowMissing.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java b/uitest/src/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
index 74a5089a84..74a5089a84 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html b/uitest/src/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
index eab6164330..eab6164330 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableModificationsWhenScrolledRight.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectMouse.html b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectMouse.html
index a980253743..a980253743 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectMouse.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectMouse.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html
index f13bd22e84..f13bd22e84 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.html b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.html
index dcf88620ca..dcf88620ca 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.java
index 56fb7c1c7d..56fb7c1c7d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableMultiSelectSimple.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthCalculation.java b/uitest/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java
index 55089ff56b..55089ff56b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthCalculation.java
+++ b/uitest/src/com/vaadin/tests/components/table/TablePageLengthCalculation.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.html b/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html
index bc438eaf1b..bc438eaf1b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.html
+++ b/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java
index 75b672a277..75b672a277 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRemoveActionHandlers.html b/uitest/src/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
index a363f6980e..a363f6980e 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRemoveActionHandlers.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java b/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
index 2b02e89c80..2b02e89c80 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html b/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html
index e523a89df3..e523a89df3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRepaintWhenMadeVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.html b/uitest/src/com/vaadin/tests/components/table/TableRowHeight.html
index a28df6329f..a28df6329f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java b/uitest/src/com/vaadin/tests/components/table/TableRowHeight.java
index eb5efbc4f3..eb5efbc4f3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.html b/uitest/src/com/vaadin/tests/components/table/TableRowHeight2.html
index a440ff84fb..a440ff84fb 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight2.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.java b/uitest/src/com/vaadin/tests/components/table/TableRowHeight2.java
index 0011fdca18..0011fdca18 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight2.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight2.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.html b/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.html
index 2aa90085e4..2aa90085e4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.java b/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.java
index c31b87f9da..c31b87f9da 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight3.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowHeight3.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html b/uitest/src/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html
index 35d64c3a0c..35d64c3a0c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.html b/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.html
index 93e5a802ee..93e5a802ee 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java b/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.java
index 4782ca94f7..4782ca94f7 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableScrollOnFocus.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrolling.html b/uitest/src/com/vaadin/tests/components/table/TableScrolling.html
index 51fa844412..51fa844412 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.html b/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelection.html
index dff3dcbc48..dff3dcbc48 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.java b/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelection.java
index f49fdfd3b9..f49fdfd3b9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableScrollsOnSelection.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableScrollsOnSelection.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSelectPagingOff.java b/uitest/src/com/vaadin/tests/components/table/TableSelectPagingOff.java
index d97e0a5cef..d97e0a5cef 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableSelectPagingOff.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableSelectPagingOff.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
index ede2ea70fc..ede2ea70fc 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
index 030a4ee259..030a4ee259 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.html b/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.html
index c809678a4f..c809678a4f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java b/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.java
index 92a1491c56..92a1491c56 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableSingleSelect.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSorting.java b/uitest/src/com/vaadin/tests/components/table/TableSorting.java
index 6417e8e853..6417e8e853 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableSorting.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableSorting.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.html b/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.html
index e9c57203c0..e9c57203c0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java b/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.java
index 9ca2605cd9..9ca2605cd9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableToggleVisibility.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableTooltips.html b/uitest/src/com/vaadin/tests/components/table/TableTooltips.html
index 989fb865c5..989fb865c5 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableTooltips.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableTooltips.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.html b/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.html
index f21a78ddb0..f21a78ddb0 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java b/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.java
index 544fe9bb67..544fe9bb67 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableUndefinedSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.html b/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.html
index 1e5617d64f..1e5617d64f 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java b/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.java
index 11f450baf2..11f450baf2 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableUnregisterComponent.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html b/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
index 05325cb9e6..05325cb9e6 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java b/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
index 98cd4e0aaa..98cd4e0aaa 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java b/uitest/src/com/vaadin/tests/components/table/TableWithChildComponents.java
index 7eb9c3239c..7eb9c3239c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithChildComponents.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html b/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html
index 5364b1cd1e..5364b1cd1e 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java b/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
index 733f46959a..733f46959a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.html b/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.html
index a933b0b1d1..a933b0b1d1 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.java b/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.java
index e0ae38a8b9..e0ae38a8b9 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithManyColumns.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithManyColumns.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html b/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html
index e3c9a8423b..e3c9a8423b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java b/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
index 226fde3b29..226fde3b29 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/Tables.java b/uitest/src/com/vaadin/tests/components/table/Tables.java
index 79a5fb367d..1431155b1a 100644
--- a/tests/testbench/com/vaadin/tests/components/table/Tables.java
+++ b/uitest/src/com/vaadin/tests/components/table/Tables.java
@@ -8,8 +8,8 @@ import java.util.List;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.Resource;
 import com.vaadin.tests.components.select.AbstractSelectTestCase;
 import com.vaadin.ui.AbstractSelect.MultiSelectMode;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html b/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html
index 451e9b9c8d..451e9b9c8d 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html
+++ b/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
index c563312efa..c563312efa 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
+++ b/uitest/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.html b/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
index 99f8f5bf9b..99f8f5bf9b 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
+++ b/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
index 5c7479d060..5c7479d060 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
+++ b/uitest/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html b/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html
index caaa15fa1c..caaa15fa1c 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html
+++ b/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissing.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java b/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
index 9ffad7f1e4..9ffad7f1e4 100644
--- a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
+++ b/uitest/src/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html b/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
index e1b39533f3..e1b39533f3 100644
--- a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
+++ b/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.html
diff --git a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java b/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
index 8e623499cf..8e623499cf 100644
--- a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
+++ b/uitest/src/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/WideSelectableTable.java b/uitest/src/com/vaadin/tests/components/table/WideSelectableTable.java
index c820dc08d5..c820dc08d5 100644
--- a/tests/testbench/com/vaadin/tests/components/table/WideSelectableTable.java
+++ b/uitest/src/com/vaadin/tests/components/table/WideSelectableTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/table/fi.gif b/uitest/src/com/vaadin/tests/components/table/fi.gif
index 8d3a191828..8d3a191828 100644
--- a/tests/testbench/com/vaadin/tests/components/table/fi.gif
+++ b/uitest/src/com/vaadin/tests/components/table/fi.gif
diff --git a/tests/testbench/com/vaadin/tests/components/table/se.gif b/uitest/src/com/vaadin/tests/components/table/se.gif
index 80f6285228..80f6285228 100644
--- a/tests/testbench/com/vaadin/tests/components/table/se.gif
+++ b/uitest/src/com/vaadin/tests/components/table/se.gif
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html b/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
index 993ef79c91..993ef79c91 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java b/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
index 4b5d216906..4b5d216906 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.html b/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChange.html
index c4f5998f47..c4f5998f47 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java b/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChange.java
index 434c73f778..434c73f778 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/PreventTabChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java b/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java
index 2b37c4358e..2b37c4358e 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html b/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
index 13f103b82d..13f103b82d 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html b/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html
index f5579c9875..f5579c9875 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java b/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
index de250539ff..de250539ff 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
index fce39361e1..fce39361e1 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
index 0d4f1fe562..0d4f1fe562 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.html
index 129061e69c..129061e69c 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
index ba737f1df8..ba737f1df8 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
index 357455545e..357455545e 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetBasicOperations.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
index d240d4b419..d240d4b419 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
index e3867cff9f..e3867cff9f 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
index bc03f7687b..bc03f7687b 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
index dfe37f2e27..dfe37f2e27 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
index 4cb6925b28..4cb6925b28 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
index 8d312f0cd8..8d312f0cd8 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
index 425da11af4..425da11af4 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
index 2e334a836e..5d814ec48f 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.tabsheet;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
index 8db5641603..8db5641603 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
index de637bbed7..de637bbed7 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
index b6cf27f6bb..b6cf27f6bb 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html
index e046cfacb4..e046cfacb4 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetSelectionStyles.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
index d49e2817d3..d49e2817d3 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
index 54a5ed4857..54a5ed4857 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
index a2c75d6e79..a2c75d6e79 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTabTheming.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java
index fea255a98d..6c39cdab73 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetTest.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.tabsheet;
 
 import java.util.LinkedHashMap;
 
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.Resource;
 import com.vaadin.tests.components.AbstractComponentContainerTest;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.TabSheet;
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html
index d61a2cbc62..d61a2cbc62 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java
index aed273dd64..aed273dd64 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithDisappearingContent.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
index 36e85c1b37..36e85c1b37 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
index d766277b48..d766277b48 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
index 1934649902..1934649902 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
index dd45e2c591..dd45e2c591 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
index da449a2461..da449a2461 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
index d133ab9937..d133ab9937 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
index 18934e9318..fefd7a0b28 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.tabsheet;
 
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.UserError;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html b/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
index 3da03edb6a..3da03edb6a 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java b/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
index 110f26d478..110f26d478 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java b/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java
index 7a676c63fb..7a676c63fb 100644
--- a/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaBasicStates.html b/uitest/src/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
index 3d44192506..3d44192506 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaBasicStates.html
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
index 992f20843b..992f20843b 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaMaxLength.html b/uitest/src/com/vaadin/tests/components/textarea/TextAreaMaxLength.html
index 5fe43b7b7a..5fe43b7b7a 100755
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaMaxLength.html
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaMaxLength.html
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html b/uitest/src/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
index 6b29b634db..6b29b634db 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaNullRepresentation.html
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java b/uitest/src/com/vaadin/tests/components/textarea/TextAreaTest.java
index e071bdd8fb..e071bdd8fb 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaWordwrap.html b/uitest/src/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
index 43bb52b3e7..43bb52b3e7 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
+++ b/uitest/src/com/vaadin/tests/components/textarea/TextAreaWordwrap.html
diff --git a/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java b/uitest/src/com/vaadin/tests/components/textarea/Wordwrap.java
index 8672d4019e..8672d4019e 100644
--- a/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java
+++ b/uitest/src/com/vaadin/tests/components/textarea/Wordwrap.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java b/uitest/src/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
index 938ecf60ce..938ecf60ce 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/IE6Cursor.java b/uitest/src/com/vaadin/tests/components/textfield/IE6Cursor.java
index eb3d3fdd51..eb3d3fdd51 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/IE6Cursor.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/IE6Cursor.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java b/uitest/src/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java
index 58bc4c5383..58bc4c5383 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java b/uitest/src/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
index 955a9c2772..955a9c2772 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html b/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
index c058d8d975..c058d8d975 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java b/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
index f6368f0c78..f6368f0c78 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.html b/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.html
index b61b464f97..b61b464f97 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java b/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.java
index da4ea9de0b..da4ea9de0b 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/SetTabIndex.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SizedTextFields.java b/uitest/src/com/vaadin/tests/components/textfield/SizedTextFields.java
index 7d993682fd..7d993682fd 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/SizedTextFields.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/SizedTextFields.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents.java
index b38dd36284..b38dd36284 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java
index 363e9d448d..363e9d448d 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEvents2.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
index 6f0772aa29..6f0772aa29 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
index 1a49729b6f..1a49729b6f 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
index ebb8b88411..ebb8b88411 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html b/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html
index dc4c0bba13..dc4c0bba13 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
index 5991ac6ff7..5991ac6ff7 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html b/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
index 544cea9faa..544cea9faa 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
index 00783e0106..00783e0106 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldBasicStates.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
index b38c24d7f5..b38c24d7f5 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldBasicStates.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
index 177a2f85cf..177a2f85cf 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
index e103afbe62..e103afbe62 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
index 21dba6a196..21dba6a196 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
index e53e8ed601..e53e8ed601 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
index 903226c87c..903226c87c 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
index d52efa0572..d52efa0572 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldMaxLength.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
index a0163352cc..a0163352cc 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldMaxLength.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
index c4a887d764..c4a887d764 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentation.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
index cfd397b4f2..cfd397b4f2 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldNullRepresentationAndSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTest.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTest.java
index 10793a8bad..10793a8bad 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTest.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
index ad98d72ce8..ad98d72ce8 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldTextChangeEvent.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.html
index fd26e3613f..fd26e3613f 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
index 747301f4e4..747301f4e4 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html
index f6406af84b..f6406af84b 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
index 4184892545..4184892545 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFields.html b/uitest/src/com/vaadin/tests/components/textfield/TextFields.html
index 3a13fdbdcf..3a13fdbdcf 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFields.html
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFields.html
diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFields.java b/uitest/src/com/vaadin/tests/components/textfield/TextFields.java
index 994769b1d1..994769b1d1 100644
--- a/tests/testbench/com/vaadin/tests/components/textfield/TextFields.java
+++ b/uitest/src/com/vaadin/tests/components/textfield/TextFields.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html b/uitest/src/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
index 8b679208d0..8b679208d0 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
+++ b/uitest/src/com/vaadin/tests/components/tree/ActionsOnTreeBackground.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java b/uitest/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
index 03645557f2..03645557f2 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
+++ b/uitest/src/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.html b/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.html
index 8bb51204aa..8bb51204aa 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.html
+++ b/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java b/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java
index d5c3654b4e..d5c3654b4e 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java
+++ b/uitest/src/com/vaadin/tests/components/tree/ExpandCollapseTree.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java b/uitest/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java
index 33bd4cef65..33bd4cef65 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java
+++ b/uitest/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.html b/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
index 7f8bb408aa..7f8bb408aa 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
+++ b/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.java b/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
index b812c9e955..b812c9e955 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
+++ b/uitest/src/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-base.html b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-base.html
index 8b9aaab2f7..8b9aaab2f7 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-base.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-base.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html
index 0200c31b4a..0200c31b4a 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html
index f69dde73e4..f69dde73e4 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-runo.html b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-runo.html
index 46d12bfb9d..46d12bfb9d 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-runo.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors.java
index 4072610996..ab9bcd9a99 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeConnectors.java
@@ -8,7 +8,7 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Tree;
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange b/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange
index 8ea2dcc107..8ea2dcc107 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java b/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange.java
index f4374ca2ee..f4374ca2ee 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeContainerChange.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html b/uitest/src/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
index 6f9b5e81c3..6f9b5e81c3 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeContextMenuAndIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html b/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html
index b093bd90d6..b093bd90d6 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java b/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
index 7aa3933752..7aa3933752 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.html b/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.html
index 2b08cdf865..2b08cdf865 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java b/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.java
index be65a335be..be65a335be 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeFiltering.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.html b/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.html
index 74a69ec203..74a69ec203 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java b/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.java
index dd407fd62a..dd407fd62a 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeFocusGaining.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.html b/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.html
index 8e882e215d..8e882e215d 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.java b/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java
index e25b2d6760..1fa73ccd6d 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeHorizontalResize.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeHorizontalResize.java
@@ -4,7 +4,7 @@ import java.util.Iterator;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.util.HierarchicalContainer;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Tree;
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html
index bf83a1acdb..bf83a1acdb 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickAndValueChange.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.html b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListening.html
index 841565df2f..841565df2f 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListening.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListening.java
index 182bc97c44..182bc97c44 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeItemClickListening.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html
index 0f0db2b71e..0f0db2b71e 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScroll.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
index ff3e52505f..ff3e52505f 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html
index 2439079d09..2439079d09 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
index 9204f0495b..9204f0495b 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html b/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
index f98482f4c7..f98482f4c7 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java b/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
index 2101abb630..f885e1d1da 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.tree;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Tree;
 
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java b/uitest/src/com/vaadin/tests/components/tree/TreePerformanceTest.java
index 892b7e669a..892b7e669a 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreePerformanceTest.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreePerformanceTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.html b/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.html
index 880d52ed75..880d52ed75 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java b/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.java
index 70c2d5d433..70c2d5d433 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrolling.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeScrolling.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html b/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
index bd8e944c32..bd8e944c32 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java b/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
index b3ab5c2b01..b3ab5c2b01 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html b/uitest/src/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html
index 53709b2a64..53709b2a64 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeShiftMultiSelectNodes.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java b/uitest/src/com/vaadin/tests/components/tree/TreeToolTips.java
index 4b892c2150..4b892c2150 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeToolTips.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeTooltip.html b/uitest/src/com/vaadin/tests/components/tree/TreeTooltip.html
index afebdaacd5..afebdaacd5 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeTooltip.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeTooltip.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.html b/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.html
index 0b01807054..0b01807054 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.html
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.html
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.java b/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.java
index fbf4a3c1d1..99618c0e5d 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeWithIcons.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeWithIcons.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.tree;
 
 import java.util.Date;
 
-import com.vaadin.terminal.Sizeable;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Sizeable;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java b/uitest/src/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
index 8da6759b20..8da6759b20 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
+++ b/uitest/src/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
diff --git a/tests/testbench/com/vaadin/tests/components/tree/Trees.java b/uitest/src/com/vaadin/tests/components/tree/Trees.java
index 3ee1d7b0de..3ee1d7b0de 100644
--- a/tests/testbench/com/vaadin/tests/components/tree/Trees.java
+++ b/uitest/src/com/vaadin/tests/components/tree/Trees.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html b/uitest/src/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html
index 15dc0e074d..15dc0e074d 100755
--- a/tests/testbench/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/AddItemToEmptyTreeTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.html b/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.html
index efcbded1d5..efcbded1d5 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java b/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
index f6b32aa4a9..f6b32aa4a9 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html b/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html
index 8391ca186d..8391ca186d 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java b/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
index 0fe8a3d1b9..4cf17aef48 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.treetable;
 
 import com.vaadin.data.Container.Hierarchical;
 import com.vaadin.data.util.HierarchicalContainer;
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html b/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html
index 05c5986e6b..05c5986e6b 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java b/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
index 8ff80204cc..8ff80204cc 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.html b/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.html
index 1a20b798ec..1a20b798ec 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java b/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.java
index 8f9c1deaf5..d9f6dcc2ac 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/DisappearingComponents.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/DisappearingComponents.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.treetable;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.UI.LegacyWindow;
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.html b/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.html
index 01bbb75361..01bbb75361 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java b/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.java
index 6dc5417d28..6dc5417d28 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/DynamicallyModified.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html b/uitest/src/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
index 81a62aaa50..81a62aaa50 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/ExpandAndCollapseListeners.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java b/uitest/src/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
index ca1c7aeb9c..2042edeea2 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.treetable;
 
 import com.vaadin.data.Container.Hierarchical;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Alignment;
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html b/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
index 0d92deec16..0d92deec16 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java b/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
index f444b781dd..f444b781dd 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
index 44dd858378..44dd858378 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
index ea76a9639a..ea76a9639a 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
index 7088497b4e..7088497b4e 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html b/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html
index 1d4c65498b..1d4c65498b 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java b/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
index e0f68225cd..e0f68225cd 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/RowAnimation.html b/uitest/src/com/vaadin/tests/components/treetable/RowAnimation.html
index 64ff061c13..64ff061c13 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/RowAnimation.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/RowAnimation.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html
index 499c30c86a..499c30c86a 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
index c2bd3da860..c2bd3da860 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
index 2143de2607..2143de2607 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableExpandWithRowStyle.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
index 09014f3aa0..09014f3aa0 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedColumns.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
index 6419a8c251..6419a8c251 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableGeneratedRows.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
index 02ce397a05..02ce397a05 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html
index b57c5f978e..b57c5f978e 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html
index b8d6cdb22e..b8d6cdb22e 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
index 1949697956..1949697956 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html
index 276725e6bd..276725e6bd 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates-LongScroll.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
index 23eaa5dfea..23eaa5dfea 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.html
index 645135575d..645135575d 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
index 20412bf0e2..20412bf0e2 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
index 5c878dba42..5c878dba42 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.html
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
index 7159addb5b..7159addb5b 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTableTest.java
index f27a47f12b..f27a47f12b 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableTest.java
diff --git a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html b/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
index a34a14eeef..a34a14eeef 100644
--- a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
+++ b/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelectSelection.html
diff --git a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java b/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java
index fc1b11bb94..fc1b11bb94 100644
--- a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java
+++ b/uitest/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java
diff --git a/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.html b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.html
index d7e1544026..d7e1544026 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.html
+++ b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.html
diff --git a/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java
index 75a98ba14e..34bf8f6715 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/LazyInitUIs.java
+++ b/uitest/src/com/vaadin/tests/components/ui/LazyInitUIs.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components.ui;
 
 import com.vaadin.UIRequiresMoreInformationException;
 import com.vaadin.annotations.EagerInit;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedRequest.BrowserDetails;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedRequest.BrowserDetails;
 import com.vaadin.tests.components.AbstractTestApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Link;
diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.html b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.html
index ed2c0ec971..ed2c0ec971 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.html
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.html
diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.java b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java
index 39cc598094..ec0cdf53a2 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/TestUITheme.java
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUITheme.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.ui;
 
 import com.vaadin.annotations.Theme;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Label;
 
diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.html b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.html
index 2f0858b4c7..2f0858b4c7 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.html
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.html
diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.java b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java
index f26e94f243..99c3c49f72 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset.java
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.ui;
 
 import com.vaadin.annotations.Widgetset;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent;
 
diff --git a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset2.java b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java
index 84c0780240..b9cdb7a3dc 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/TestUIWidgetset2.java
+++ b/uitest/src/com/vaadin/tests/components/ui/TestUIWidgetset2.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.ui;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent;
 
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UIInitException.java b/uitest/src/com/vaadin/tests/components/ui/UIInitException.java
index 29de6f6ac3..e225ae73d8 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UIInitException.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIInitException.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.ui;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 
 public class UIInitException extends AbstractTestUI {
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UIInitTest.java b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java
index 6efe1d1b28..68e6a4da34 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UIInitTest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIInitTest.java
@@ -4,7 +4,7 @@
 
 package com.vaadin.tests.components.ui;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Label;
 
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.html b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.html
index 08561588c4..08561588c4 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.html
+++ b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.html
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.java b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
index 8dd303a8e1..022db1bf3e 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.ui;
 
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.terminal.AbstractUIProvider;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.AbstractUIProvider;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.html b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.html
index bcb9f52afe..bcb9f52afe 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.html
+++ b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.java b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java
index d2167e67c7..b64770408b 100644
--- a/tests/testbench/com/vaadin/tests/components/ui/UriFragmentTest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UriFragmentTest.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.ui;
 
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Page.FragmentChangedEvent;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.Page;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.Page.FragmentChangedEvent;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java b/uitest/src/com/vaadin/tests/components/upload/ForceSubmit.java
index 47aad46348..47aad46348 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java
+++ b/uitest/src/com/vaadin/tests/components/upload/ForceSubmit.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java b/uitest/src/com/vaadin/tests/components/upload/TestFileUpload.java
index ad86d0f593..ad86d0f593 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java
+++ b/uitest/src/com/vaadin/tests/components/upload/TestFileUpload.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/uitest/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
index 7607536357..7607536357 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
+++ b/uitest/src/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java b/uitest/src/com/vaadin/tests/components/upload/TestUpload.java
index 9ca0cb9c38..9ca0cb9c38 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java
+++ b/uitest/src/com/vaadin/tests/components/upload/TestUpload.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java b/uitest/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
index 516ca2d7c9..516ca2d7c9 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
+++ b/uitest/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java b/uitest/src/com/vaadin/tests/components/upload/TestUploadFilename.java
index de0cca5009..de0cca5009 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java
+++ b/uitest/src/com/vaadin/tests/components/upload/TestUploadFilename.java
diff --git a/tests/testbench/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png b/uitest/src/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png
index 39daa93ea5..39daa93ea5 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png
+++ b/uitest/src/com/vaadin/tests/components/upload/file-binary-cb4a65687deb859957ad4b0fd9d67eac.png
diff --git a/tests/testbench/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f b/uitest/src/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f
index 584a249bba..584a249bba 100644
--- a/tests/testbench/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f
+++ b/uitest/src/com/vaadin/tests/components/upload/file-text-6ebed606225d0b6254d45f51aa2dfe9f
diff --git a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
index a2f03212b0..6d2623c199 100644
--- a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
+++ b/uitest/src/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
@@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.vaadin.event.ShortcutAction.KeyCode;
-import com.vaadin.terminal.gwt.server.HttpServletRequestListener;
+import com.vaadin.server.HttpServletRequestListener;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html b/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
index 2e15d8d645..2e15d8d645 100644
--- a/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
+++ b/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java b/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
index a7fcda3cf1..a7fcda3cf1 100644
--- a/tests/testbench/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
+++ b/uitest/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.html b/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.html
index 6e3eb906b7..6e3eb906b7 100644
--- a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.html
+++ b/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java b/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.java
index 8060ec9955..8060ec9955 100644
--- a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/CloseSubWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java b/uitest/src/com/vaadin/tests/components/window/DownloadAndUpdate.java
index 76b93cae56..573f55b29d 100644
--- a/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/window/DownloadAndUpdate.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.window;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.html b/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
index d74e09dd6a..d74e09dd6a 100644
--- a/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
+++ b/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.java b/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
index cd990f94b7..6ca5837cee 100644
--- a/tests/testbench/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.window;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.Window;
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java b/uitest/src/com/vaadin/tests/components/window/ExecuteJavaScript.java
index 92e0e734ff..92e0e734ff 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java
+++ b/uitest/src/com/vaadin/tests/components/window/ExecuteJavaScript.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.html b/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
index 128e3c3583..128e3c3583 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
+++ b/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.java b/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
index 5ce0636f6f..5ce0636f6f 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/ExtraLargeSubWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.html b/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.html
index 65e8b0166b..65e8b0166b 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.html
+++ b/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java b/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.java
index 1cdfdef0b5..03deb4ea20 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java
+++ b/uitest/src/com/vaadin/tests/components/window/ExtraWindowShown.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.window;
 
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/components/window/FullSizedWindow.java b/uitest/src/com/vaadin/tests/components/window/FullSizedWindow.java
index 6d0dc74e93..6d0dc74e93 100644
--- a/tests/testbench/com/vaadin/tests/components/window/FullSizedWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/FullSizedWindow.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java b/uitest/src/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
index 3b8067c726..3b8067c726 100644
--- a/tests/testbench/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
+++ b/uitest/src/com/vaadin/tests/components/window/HugeWindowShouldBeClosable.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java b/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java
index 80497528ca..bacc4c131c 100644
--- a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java
+++ b/uitest/src/com/vaadin/tests/components/window/LazyWindowResize.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.components.window;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.server.Page.BrowserWindowResizeEvent;
+import com.vaadin.server.Page.BrowserWindowResizeListener;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.Page.BrowserWindowResizeEvent;
-import com.vaadin.terminal.Page.BrowserWindowResizeListener;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.tests.util.LoremIpsum;
diff --git a/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java b/uitest/src/com/vaadin/tests/components/window/LongNotifications.java
index be67cfe9a0..be67cfe9a0 100644
--- a/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java
+++ b/uitest/src/com/vaadin/tests/components/window/LongNotifications.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/ModalWindowNativeSelect.java b/uitest/src/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
index 2c6d3c942f..2c6d3c942f 100644
--- a/tests/testbench/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
+++ b/uitest/src/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/PositionedSubWindows.java b/uitest/src/com/vaadin/tests/components/window/PositionedSubWindows.java
index 9fe44dd7e8..9fe44dd7e8 100644
--- a/tests/testbench/com/vaadin/tests/components/window/PositionedSubWindows.java
+++ b/uitest/src/com/vaadin/tests/components/window/PositionedSubWindows.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.html b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.html
index 9cbcf1d5ea..9cbcf1d5ea 100644
--- a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.html
+++ b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java
index 4d2f118ec7..847ee585f7 100644
--- a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java
+++ b/uitest/src/com/vaadin/tests/components/window/RepaintWindowContents.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.window;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java b/uitest/src/com/vaadin/tests/components/window/SubWindowFocus.java
index 389c926986..389c926986 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowFocus.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java b/uitest/src/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
index 273d48514c..273d48514c 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.html b/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.html
index 0476de6c35..0476de6c35 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.html
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java b/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.java
index 0ca7fd1067..0ca7fd1067 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowOrder.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowPositionUpdate.java b/uitest/src/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
index 9383dba80f..9383dba80f 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowPositionUpdate.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.html b/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.html
index 2c3f651e41..2c3f651e41 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.html
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java b/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
index 5bda762d3f..5bda762d3f 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindows-runo.html b/uitest/src/com/vaadin/tests/components/window/SubWindows-runo.html
index 5cbd350174..5cbd350174 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindows-runo.html
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindows-runo.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindows.html b/uitest/src/com/vaadin/tests/components/window/SubWindows.html
index 3b2109e3f1..3b2109e3f1 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindows.html
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindows.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindows.java b/uitest/src/com/vaadin/tests/components/window/SubWindows.java
index c39bfdb713..c39bfdb713 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubWindows.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubWindows.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java b/uitest/src/com/vaadin/tests/components/window/SubwindowDraggability.java
index 45fb343b45..45fb343b45 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubwindowDraggability.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/SubwindowInvalidLayout.java b/uitest/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
index 03e5988fad..03e5988fad 100644
--- a/tests/testbench/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
+++ b/uitest/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html b/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
index f926696d63..f926696d63 100644
--- a/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
+++ b/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java b/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
index 859c1b4b5d..859c1b4b5d 100644
--- a/tests/testbench/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
+++ b/uitest/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.html b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.html
index d734cab9ea..d734cab9ea 100644
--- a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.html
+++ b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java
index a77a1f7703..7d4efe39ce 100644
--- a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java
+++ b/uitest/src/com/vaadin/tests/components/window/TooltipInWindow.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.components.window;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.Window;
diff --git a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html b/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html
index a3b56cd12a..a3b56cd12a 100644
--- a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html
+++ b/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java b/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
index 715d089f57..715d089f57 100644
--- a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
+++ b/uitest/src/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowCaptionTest.html b/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.html
index a9a6fd621e..a9a6fd621e 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowCaptionTest.html
+++ b/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html b/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.html
index af5b9ec180..af5b9ec180 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html
+++ b/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java b/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.java
index a4120b7d42..a4120b7d42 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowClickEvents.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java b/uitest/src/com/vaadin/tests/components/window/WindowResizeListener.java
index 74d7b564db..57a125bcb7 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowResizeListener.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.window;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Page.BrowserWindowResizeEvent;
+import com.vaadin.server.Page;
+import com.vaadin.server.Page.BrowserWindowResizeEvent;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/uitest/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
index 033de48446..033de48446 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java b/uitest/src/com/vaadin/tests/components/window/WindowScrollingUp.java
index 5f55ad8cf3..5f55ad8cf3 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowScrollingUp.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html b/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
index 4923bff58a..4923bff58a 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
+++ b/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
index fa01706c56..fa01706c56 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java b/uitest/src/com/vaadin/tests/components/window/WindowStyleNames.java
index 615f391613..615f391613 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowStyleNames.java
diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowTest.java b/uitest/src/com/vaadin/tests/components/window/WindowTest.java
index ae3b0f22df..ae3b0f22df 100644
--- a/tests/testbench/com/vaadin/tests/components/window/WindowTest.java
+++ b/uitest/src/com/vaadin/tests/components/window/WindowTest.java
diff --git a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/uitest/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
index 4f41410ba3..8b8ad4cf70 100644
--- a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
+++ b/uitest/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
@@ -4,7 +4,7 @@ import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerTest.java b/uitest/src/com/vaadin/tests/containers/BeanItemContainerTest.java
index 905ec2f9ff..905ec2f9ff 100644
--- a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerTest.java
+++ b/uitest/src/com/vaadin/tests/containers/BeanItemContainerTest.java
diff --git a/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java b/uitest/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
index eba8ded705..eba8ded705 100644
--- a/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
+++ b/uitest/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
diff --git a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/uitest/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
index b30ef3e616..a1dba3eed8 100644
--- a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
+++ b/uitest/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
@@ -4,7 +4,7 @@ import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java b/uitest/src/com/vaadin/tests/containers/TableWithFileSystemContainer.java
index 25d0053fb2..25d0053fb2 100644
--- a/tests/testbench/com/vaadin/tests/containers/TableWithFileSystemContainer.java
+++ b/uitest/src/com/vaadin/tests/containers/TableWithFileSystemContainer.java
diff --git a/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java b/uitest/src/com/vaadin/tests/containers/TestItemSorter.java
index 46c4e004c1..46c4e004c1 100644
--- a/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java
+++ b/uitest/src/com/vaadin/tests/containers/TestItemSorter.java
diff --git a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html b/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html
index b5ccd53df0..b5ccd53df0 100644
--- a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html
+++ b/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.html
diff --git a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java b/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
index 0afaf2c15f..0afaf2c15f 100644
--- a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
+++ b/uitest/src/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
index 0c1fdc23f6..0c1fdc23f6 100644
--- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java
diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
index aec0f0e28e..aec0f0e28e 100644
--- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
index b7b1e74eb0..b7b1e74eb0 100644
--- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
index 8bb2ba1092..8bb2ba1092 100644
--- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
+++ b/uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
diff --git a/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java b/uitest/src/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
index 59aa45dc36..59aa45dc36 100644
--- a/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
+++ b/uitest/src/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
diff --git a/tests/testbench/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java b/uitest/src/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
index 23c22a7026..23c22a7026 100644
--- a/tests/testbench/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
+++ b/uitest/src/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
diff --git a/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java b/uitest/src/com/vaadin/tests/dd/AcceptAnythingWindow.java
index 5d57de388c..5d57de388c 100644
--- a/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java
+++ b/uitest/src/com/vaadin/tests/dd/AcceptAnythingWindow.java
diff --git a/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java b/uitest/src/com/vaadin/tests/dd/AcceptFromComponent.java
index 99dd069142..99dd069142 100644
--- a/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java
+++ b/uitest/src/com/vaadin/tests/dd/AcceptFromComponent.java
diff --git a/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java b/uitest/src/com/vaadin/tests/dd/ActiveDragSourceClassName.java
index 9ef1b4029b..9ef1b4029b 100644
--- a/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java
+++ b/uitest/src/com/vaadin/tests/dd/ActiveDragSourceClassName.java
diff --git a/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java b/uitest/src/com/vaadin/tests/dd/CustomDDImplementation.java
index f6e196761e..f6e196761e 100644
--- a/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java
+++ b/uitest/src/com/vaadin/tests/dd/CustomDDImplementation.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest1.java b/uitest/src/com/vaadin/tests/dd/DDTest1.java
index 3f0689cdc1..161a9b423e 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest1.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest1.java
@@ -10,8 +10,8 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
-import com.vaadin.terminal.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractSelect.AcceptItem;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest2.java b/uitest/src/com/vaadin/tests/dd/DDTest2.java
index 4d649c6056..7757513fc1 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest2.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest2.java
@@ -15,8 +15,8 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.event.dd.acceptcriteria.And;
 import com.vaadin.event.dd.acceptcriteria.Or;
 import com.vaadin.event.dd.acceptcriteria.SourceIs;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Person;
 import com.vaadin.tests.util.PersonContainer;
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest4.java b/uitest/src/com/vaadin/tests/dd/DDTest4.java
index 044fe1f49a..044fe1f49a 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest4.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest4.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest5.java b/uitest/src/com/vaadin/tests/dd/DDTest5.java
index 43342fdc35..43342fdc35 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest5.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest5.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest6.java b/uitest/src/com/vaadin/tests/dd/DDTest6.java
index f1e31c1452..a4c566d75a 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest6.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest6.java
@@ -25,12 +25,12 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.event.dd.acceptcriteria.Not;
 import com.vaadin.event.dd.acceptcriteria.SourceIsTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.StreamResource;
+import com.vaadin.server.StreamVariable;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.StreamResource.StreamSource;
 import com.vaadin.shared.MouseEventDetails;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.StreamResource;
-import com.vaadin.terminal.StreamResource.StreamSource;
-import com.vaadin.terminal.StreamVariable;
-import com.vaadin.terminal.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.ui.AbsoluteLayout;
@@ -229,7 +229,7 @@ public class DDTest6 extends TestBase {
                     return null;
                 }
             };
-            return new StreamResource(streamSource, getName(), DDTest6.get());
+            return new StreamResource(streamSource, getName());
         }
     }
 
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest7.java b/uitest/src/com/vaadin/tests/dd/DDTest7.java
index 1abf9e379c..1abf9e379c 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest7.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest7.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest8.java b/uitest/src/com/vaadin/tests/dd/DDTest8.java
index ee7d8d9dc5..ee7d8d9dc5 100644
--- a/tests/testbench/com/vaadin/tests/dd/DDTest8.java
+++ b/uitest/src/com/vaadin/tests/dd/DDTest8.java
diff --git a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java b/uitest/src/com/vaadin/tests/dd/DragAndDropFiles.java
index bea00ae0ad..4ecabee617 100644
--- a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java
+++ b/uitest/src/com/vaadin/tests/dd/DragAndDropFiles.java
@@ -8,7 +8,7 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
-import com.vaadin.terminal.StreamVariable;
+import com.vaadin.server.StreamVariable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
diff --git a/tests/testbench/com/vaadin/tests/dd/DragDropPane.java b/uitest/src/com/vaadin/tests/dd/DragDropPane.java
index a94b676f2c..970e1b0141 100644
--- a/tests/testbench/com/vaadin/tests/dd/DragDropPane.java
+++ b/uitest/src/com/vaadin/tests/dd/DragDropPane.java
@@ -9,8 +9,8 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
+import com.vaadin.server.StreamVariable;
 import com.vaadin.shared.MouseEventDetails;
-import com.vaadin.terminal.StreamVariable;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.AbsoluteLayout.ComponentPosition;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/uitest/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
index fe33bce76b..fe33bce76b 100644
--- a/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
+++ b/uitest/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java
diff --git a/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/uitest/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
index 4e9e89add5..4e9e89add5 100644
--- a/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
+++ b/uitest/src/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java
diff --git a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java b/uitest/src/com/vaadin/tests/dd/MyDragSourceConnector.java
index abc3f7f010..e787a182e4 100644
--- a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java
+++ b/uitest/src/com/vaadin/tests/dd/MyDragSourceConnector.java
@@ -15,11 +15,11 @@
  */
 package com.vaadin.tests.dd;
 
+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.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.tests.dd.CustomDDImplementation.MyDragSource;
 
 @Connect(MyDragSource.class)
diff --git a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java b/uitest/src/com/vaadin/tests/dd/MyDropTargetConnector.java
index d70c788fa4..f0f2b5dfd6 100644
--- a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java
+++ b/uitest/src/com/vaadin/tests/dd/MyDropTargetConnector.java
@@ -15,11 +15,11 @@
  */
 package com.vaadin.tests.dd;
 
+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.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.tests.dd.CustomDDImplementation.MyDropTarget;
 
 @Connect(MyDropTarget.class)
diff --git a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.html b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.html
index 03a4830584..03a4830584 100644
--- a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.html
+++ b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.html
diff --git a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.java
index 020a6b56c5..020a6b56c5 100644
--- a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java
+++ b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSource.java
diff --git a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
index e19bbaf2c5..e19bbaf2c5 100644
--- a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
+++ b/uitest/src/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
diff --git a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled b/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled
index e69de29bb2..e69de29bb2 100644
--- a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled
+++ b/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.html.disabled
diff --git a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java b/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.java
index 951b9a4a57..951b9a4a57 100644
--- a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java
+++ b/uitest/src/com/vaadin/tests/dd/ScrolledDropTarget.java
diff --git a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java b/uitest/src/com/vaadin/tests/dd/StartHtml5Drag.java
index 1a01564220..609b2fe4fc 100644
--- a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java
+++ b/uitest/src/com/vaadin/tests/dd/StartHtml5Drag.java
@@ -4,8 +4,8 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
-import com.vaadin.terminal.ClassResource;
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.ClassResource;
+import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
@@ -44,8 +44,7 @@ public class StartHtml5Drag extends TestBase {
         });
         addComponent(dropTarget);
 
-        Embedded iframe = new Embedded("", new ClassResource("html5drop.htm",
-                this));
+        Embedded iframe = new Embedded("", new ClassResource("html5drop.htm"));
         iframe.setType(Embedded.TYPE_BROWSER);
         iframe.setWidth(400, Sizeable.UNITS_PIXELS);
         iframe.setHeight(400, Sizeable.UNITS_PIXELS);
diff --git a/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java b/uitest/src/com/vaadin/tests/dd/TreeDragStart.java
index 27ac8b6586..27ac8b6586 100644
--- a/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java
+++ b/uitest/src/com/vaadin/tests/dd/TreeDragStart.java
diff --git a/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java b/uitest/src/com/vaadin/tests/dd/VMyDragSource.java
index e6c7078e8e..8cca6d6459 100644
--- a/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java
+++ b/uitest/src/com/vaadin/tests/dd/VMyDragSource.java
@@ -11,8 +11,8 @@ import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager;
-import com.vaadin.terminal.gwt.client.ui.dd.VTransferable;
+import com.vaadin.client.ui.dd.VDragAndDropManager;
+import com.vaadin.client.ui.dd.VTransferable;
 
 /**
  * Example code to implement Component that has something to drag.
diff --git a/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java b/uitest/src/com/vaadin/tests/dd/VMyDropTarget.java
index 627f0554f6..58bd326524 100644
--- a/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java
+++ b/uitest/src/com/vaadin/tests/dd/VMyDropTarget.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.dd;
 
 import com.google.gwt.user.client.ui.Composite;
-import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-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.client.ApplicationConnection;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.ui.dd.VDragEvent;
+import com.vaadin.client.ui.dd.VDropHandler;
+import com.vaadin.client.ui.dd.VHasDropHandler;
 
 public class VMyDropTarget extends Composite implements VHasDropHandler,
         VDropHandler {
diff --git a/tests/testbench/com/vaadin/tests/dd/html5drop.htm b/uitest/src/com/vaadin/tests/dd/html5drop.htm
index ed05fcedea..ed05fcedea 100644
--- a/tests/testbench/com/vaadin/tests/dd/html5drop.htm
+++ b/uitest/src/com/vaadin/tests/dd/html5drop.htm
diff --git a/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.html b/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.html
index 11640ef6c3..11640ef6c3 100644
--- a/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.html
+++ b/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.html
diff --git a/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.java b/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.java
index 3e04d27628..3e04d27628 100644
--- a/tests/testbench/com/vaadin/tests/debug/DebugWindowPresent.java
+++ b/uitest/src/com/vaadin/tests/debug/DebugWindowPresent.java
diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java b/uitest/src/com/vaadin/tests/extensions/BasicExtension.java
index 29e37d9847..e4fc291728 100644
--- a/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java
+++ b/uitest/src/com/vaadin/tests/extensions/BasicExtension.java
@@ -16,8 +16,8 @@
 
 package com.vaadin.tests.extensions;
 
-import com.vaadin.terminal.AbstractClientConnector;
-import com.vaadin.terminal.AbstractExtension;
+import com.vaadin.server.AbstractClientConnector;
+import com.vaadin.server.AbstractExtension;
 
 public class BasicExtension extends AbstractExtension {
     @Override
diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.html b/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.html
index 804c3b6cdb..c57882b3f4 100644
--- a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.html
+++ b/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.html
@@ -24,7 +24,7 @@
 <tr>
 	<td>assertText</td>
 	<td>//div[2]</td>
-	<td>BasicExtensionTestConnector extending RootConnector</td>
+	<td>BasicExtensionTestConnector extending UIConnector</td>
 </tr>
 <tr>
 	<td>click</td>
@@ -34,7 +34,7 @@
 <tr>
 	<td>assertText</td>
 	<td>//div[1]</td>
-	<td>BasicExtensionTestConnector removed for RootConnector</td>
+	<td>BasicExtensionTestConnector removed for UIConnector</td>
 </tr>
 </tbody></table>
 </body>
diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java b/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.java
index daa2e78353..40856af11e 100644
--- a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java
+++ b/uitest/src/com/vaadin/tests/extensions/BasicExtensionTest.java
@@ -17,7 +17,7 @@
 package com.vaadin.tests.extensions;
 
 import com.vaadin.annotations.Widgetset;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java b/uitest/src/com/vaadin/tests/extensions/HelloWorldExtension.java
index 60db95827c..e8a33fd3af 100644
--- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java
+++ b/uitest/src/com/vaadin/tests/extensions/HelloWorldExtension.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.tests.extensions;
 
-import com.vaadin.terminal.AbstractExtension;
+import com.vaadin.server.AbstractExtension;
 import com.vaadin.tests.widgetset.client.helloworldfeature.GreetAgainRpc;
 import com.vaadin.tests.widgetset.client.helloworldfeature.HelloWorldRpc;
 import com.vaadin.tests.widgetset.client.helloworldfeature.HelloWorldState;
diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/uitest/src/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
index e4646572db..576b16fbb6 100644
--- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
+++ b/uitest/src/com/vaadin/tests/extensions/HelloWorldExtensionTest.java
@@ -16,7 +16,7 @@
 package com.vaadin.tests.extensions;
 
 import com.vaadin.annotations.Widgetset;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.html b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.html
index 7bdb8cd50f..7bdb8cd50f 100644
--- a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.html
+++ b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.html
diff --git a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java
index 6281f3eff4..a4e2acb31e 100644
--- a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java
+++ b/uitest/src/com/vaadin/tests/extensions/JavascriptManagerTest.java
@@ -19,7 +19,7 @@ package com.vaadin.tests.extensions;
 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.JavaScript;
diff --git a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
index c604516b9c..18054c8e0f 100644
--- a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
+++ b/uitest/src/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java
@@ -20,11 +20,11 @@ import com.vaadin.annotations.JavaScript;
 import com.vaadin.annotations.StyleSheet;
 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
+import com.vaadin.server.AbstractJavaScriptExtension;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.shared.JavaScriptExtensionState;
 import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.ServerRpc;
-import com.vaadin.terminal.AbstractJavaScriptExtension;
-import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java b/uitest/src/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
index 894944d186..894944d186 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java b/uitest/src/com/vaadin/tests/fieldgroup/BasicPersonForm.java
index b399857b3b..b399857b3b 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/BasicPersonForm.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/BooleanTextField.html b/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextField.html
index c2c8842bcb..c2c8842bcb 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/BooleanTextField.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextField.html
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html b/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
index 2ad104c16c..2ad104c16c 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html b/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
index 2c88930077..2c88930077 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java b/uitest/src/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
index 4f83f5d0fd..4f83f5d0fd 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html b/uitest/src/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html
index a2ac1b748b..a2ac1b748b 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FieldGroupDiscard.html
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java b/uitest/src/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
index 5f25070f2e..5f25070f2e 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FormManyToMany.java b/uitest/src/com/vaadin/tests/fieldgroup/FormManyToMany.java
index f4f612503c..f4f612503c 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FormManyToMany.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FormManyToMany.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FormOneToMany.java b/uitest/src/com/vaadin/tests/fieldgroup/FormOneToMany.java
index e269a39441..e269a39441 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FormOneToMany.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FormOneToMany.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FormOneToOne.java b/uitest/src/com/vaadin/tests/fieldgroup/FormOneToOne.java
index b16cb29a8a..b16cb29a8a 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FormOneToOne.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FormOneToOne.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java b/uitest/src/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
index f66d822495..f66d822495 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
+++ b/uitest/src/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html b/uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html
index b7c40b4d9e..b7c40b4d9e 100644
--- a/tests/testbench/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html
diff --git a/tests/testbench/com/vaadin/tests/fields/FormManyToMany.java b/uitest/src/com/vaadin/tests/fields/FormManyToMany.java
index 43fba20f33..43fba20f33 100644
--- a/tests/testbench/com/vaadin/tests/fields/FormManyToMany.java
+++ b/uitest/src/com/vaadin/tests/fields/FormManyToMany.java
diff --git a/tests/testbench/com/vaadin/tests/fields/FormOneToMany.java b/uitest/src/com/vaadin/tests/fields/FormOneToMany.java
index a010e935ab..a010e935ab 100644
--- a/tests/testbench/com/vaadin/tests/fields/FormOneToMany.java
+++ b/uitest/src/com/vaadin/tests/fields/FormOneToMany.java
diff --git a/tests/testbench/com/vaadin/tests/fields/FormOneToOne.java b/uitest/src/com/vaadin/tests/fields/FormOneToOne.java
index 36f4dfe0ea..36f4dfe0ea 100644
--- a/tests/testbench/com/vaadin/tests/fields/FormOneToOne.java
+++ b/uitest/src/com/vaadin/tests/fields/FormOneToOne.java
diff --git a/tests/testbench/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html b/uitest/src/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html
index 24e5e992ca..24e5e992ca 100644
--- a/tests/testbench/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html
+++ b/uitest/src/com/vaadin/tests/gwtadapter/componentlocator/TestDetachedNotPresent.html
diff --git a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java b/uitest/src/com/vaadin/tests/integration/EmbedSizeTest.java
index 6a9f696e75..7afdf906b5 100644
--- a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java
+++ b/uitest/src/com/vaadin/tests/integration/EmbedSizeTest.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.integration;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Page.BrowserWindowResizeEvent;
+import com.vaadin.server.Page;
+import com.vaadin.server.Page.BrowserWindowResizeEvent;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.CheckBox;
diff --git a/tests/testbench/com/vaadin/tests/integration/FlagSeResource.java b/uitest/src/com/vaadin/tests/integration/FlagSeResource.java
index f80e9e3a2f..6c2fcdc2d4 100644
--- a/tests/testbench/com/vaadin/tests/integration/FlagSeResource.java
+++ b/uitest/src/com/vaadin/tests/integration/FlagSeResource.java
@@ -1,17 +1,16 @@
 package com.vaadin.tests.integration;
 
-import com.vaadin.Application;
-import com.vaadin.terminal.ClassResource;
+import com.vaadin.server.ClassResource;
 
 public class FlagSeResource extends ClassResource {
 
-    public FlagSeResource(Application application) {
+    public FlagSeResource() {
         super("/"
                 + FlagSeResource.class
                         .getName()
                         .replace('.', '/')
                         .replaceAll(FlagSeResource.class.getSimpleName() + "$",
-                                "") + "se.gif", application);
+                                "") + "se.gif");
 
     }
 }
diff --git a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java
index b3fc9c8ffb..9c7225b510 100644
--- a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java
+++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java
@@ -4,11 +4,11 @@ import com.vaadin.Application;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.terminal.ClassResource;
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.ClassResource;
+import com.vaadin.server.Resource;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.Table;
+import com.vaadin.ui.UI.LegacyWindow;
 
 public class IntegrationTestApplication extends Application.LegacyApplication {
 
@@ -28,11 +28,10 @@ public class IntegrationTestApplication extends Application.LegacyApplication {
         window.addComponent(table);
 
         Item item = table.addItem("FI");
-        item.getItemProperty("icon")
-                .setValue(new ClassResource("fi.gif", this));
+        item.getItemProperty("icon").setValue(new ClassResource("fi.gif"));
         item.getItemProperty("country").setValue("Finland");
         item = table.addItem("SE");
-        item.getItemProperty("icon").setValue(new FlagSeResource(this));
+        item.getItemProperty("icon").setValue(new FlagSeResource());
         item.getItemProperty("country").setValue("Sweden");
 
         final Label selectedLabel = new Label();
diff --git a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java b/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java
index c2a01b16dd..2243adf336 100644
--- a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java
+++ b/uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java
@@ -20,17 +20,17 @@ import javax.portlet.WindowState;
 
 import com.vaadin.Application;
 import com.vaadin.annotations.StyleSheet;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.PortletApplicationContext2;
+import com.vaadin.server.PortletApplicationContext2.PortletListener;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.gwt.server.PortletApplicationContext2;
-import com.vaadin.terminal.gwt.server.PortletApplicationContext2.PortletListener;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Notification;
+import com.vaadin.ui.TextField;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.UI.LegacyWindow;
-import com.vaadin.ui.TextField;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.Upload.Receiver;
 
@@ -57,11 +57,11 @@ public class JSR286PortletApplication extends Application.LegacyApplication {
 
         Embedded appResourceTest = new Embedded(
                 "Test of ApplicationResources with full path",
-                new FlagSeResource(this));
+                new FlagSeResource());
         main.addComponent(appResourceTest);
         Embedded specialNameResourceTest = new Embedded(
                 "Test ApplicationResources with special names",
-                new SpecialNameResource(this));
+                new SpecialNameResource());
         specialNameResourceTest.addStyleName("hugeBorder");
         main.addComponent(specialNameResourceTest);
 
diff --git a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java
index a233191070..0cbf50ae1b 100644
--- a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java
+++ b/uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java
@@ -8,13 +8,13 @@ import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.event.Action;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.Page;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.shared.ui.slider.SliderOrientation;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractSelect;
 import com.vaadin.ui.Accordion;
diff --git a/tests/testbench/com/vaadin/tests/integration/PortletConnectorResource.css b/uitest/src/com/vaadin/tests/integration/PortletConnectorResource.css
index 7338e4708a..7338e4708a 100644
--- a/tests/testbench/com/vaadin/tests/integration/PortletConnectorResource.css
+++ b/uitest/src/com/vaadin/tests/integration/PortletConnectorResource.css
diff --git a/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
index fc54547890..fc54547890 100644
--- a/tests/testbench/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
+++ b/uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
diff --git a/uitest/src/com/vaadin/tests/integration/SpecialNameResource.java b/uitest/src/com/vaadin/tests/integration/SpecialNameResource.java
new file mode 100644
index 0000000000..3806e61c36
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/SpecialNameResource.java
@@ -0,0 +1,9 @@
+package com.vaadin.tests.integration;
+
+import com.vaadin.server.ClassResource;
+
+public class SpecialNameResource extends ClassResource {
+    public SpecialNameResource() {
+        super("spe=cial%res&ource.gif");
+    }
+}
diff --git a/tests/testbench/com/vaadin/tests/integration/fi.gif b/uitest/src/com/vaadin/tests/integration/fi.gif
index 8d3a191828..8d3a191828 100644
--- a/tests/testbench/com/vaadin/tests/integration/fi.gif
+++ b/uitest/src/com/vaadin/tests/integration/fi.gif
diff --git a/tests/testbench/com/vaadin/tests/integration/se.gif b/uitest/src/com/vaadin/tests/integration/se.gif
index 80f6285228..80f6285228 100644
--- a/tests/testbench/com/vaadin/tests/integration/se.gif
+++ b/uitest/src/com/vaadin/tests/integration/se.gif
diff --git a/tests/testbench/com/vaadin/tests/integration/spe=cial%res&ource.gif b/uitest/src/com/vaadin/tests/integration/spe=cial%res&ource.gif
index 41bdd9a6be..41bdd9a6be 100644
--- a/tests/testbench/com/vaadin/tests/integration/spe=cial%res&ource.gif
+++ b/uitest/src/com/vaadin/tests/integration/spe=cial%res&ource.gif
diff --git a/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java b/uitest/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
index b2cadebd02..b2cadebd02 100644
--- a/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
+++ b/uitest/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java b/uitest/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
index 77b8e249ba..03c3c43ccd 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java
+++ b/uitest/src/com/vaadin/tests/layouts/CaptionsInLayouts.java
@@ -6,8 +6,8 @@ import java.util.List;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
index 6dab84d718..6dab84d718 100644
--- a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
+++ b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
index 7877ca3fe3..f4050ea085 100644
--- a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
+++ b/uitest/src/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java b/uitest/src/com/vaadin/tests/layouts/CssLayoutCustomCss.java
index 2f717d2b64..2f717d2b64 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java
+++ b/uitest/src/com/vaadin/tests/layouts/CssLayoutCustomCss.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
index 0932be5d81..0932be5d81 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
+++ b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
index 093dc782fb..093dc782fb 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
+++ b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
index df4fc8615d..df4fc8615d 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
+++ b/uitest/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java b/uitest/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
index ed3c5e66d3..ed3c5e66d3 100644
--- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
+++ b/uitest/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java b/uitest/src/com/vaadin/tests/layouts/DeepComponentTrees.java
index e119b91b82..e119b91b82 100644
--- a/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java
+++ b/uitest/src/com/vaadin/tests/layouts/DeepComponentTrees.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java b/uitest/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
index f596fdb77e..f596fdb77e 100644
--- a/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
+++ b/uitest/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java
index 2d5bc8d59a..9f2715a09b 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutCaptions.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.layouts;
 import com.vaadin.data.Item;
 import com.vaadin.data.Validator;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.terminal.AbstractErrorMessage;
+import com.vaadin.server.AbstractErrorMessage;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index acc5f07103..acc5f07103 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
index e200c40744..e200c40744 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
index 6273b92838..6273b92838 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.html b/uitest/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
index 77a17263f8..77a17263f8 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.java
index efd1277653..efd1277653 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutMoveComponent.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutNPE.java
index 3531a4e13c..3531a4e13c 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutNPE.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
index 5d45f72142..5d45f72142 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html b/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
index 5237d5f49e..5237d5f49e 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
index 9753526a9e..9753526a9e 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutSpanExpansion.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.html b/uitest/src/com/vaadin/tests/layouts/GridLayoutWidthChange.html
index f01a1a7026..f01a1a7026 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.html
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutWidthChange.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java b/uitest/src/com/vaadin/tests/layouts/GridLayoutWidthChange.java
index c0e6b27c7d..c0e6b27c7d 100644
--- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java
+++ b/uitest/src/com/vaadin/tests/layouts/GridLayoutWidthChange.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/uitest/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
index dc0c8958ea..dc0c8958ea 100644
--- a/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
+++ b/uitest/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java b/uitest/src/com/vaadin/tests/layouts/LayoutPerformanceTests.java
index 57c6173895..57c6173895 100644
--- a/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/LayoutPerformanceTests.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html b/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
index 31b3985a1c..31b3985a1c 100644
--- a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
+++ b/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
index 87ce80d4f7..87ce80d4f7 100644
--- a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
+++ b/uitest/src/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.html b/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.html
index a3f3f84dac..a3f3f84dac 100644
--- a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.html
+++ b/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java b/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.java
index 1285e5b52e..1285e5b52e 100644
--- a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java
+++ b/uitest/src/com/vaadin/tests/layouts/MovingInvisibleField.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/uitest/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index 2ceb6428ed..9e0380a1f6 100644
--- a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java
+++ b/uitest/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
@@ -4,8 +4,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Alignment;
diff --git a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java b/uitest/src/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
index 41f1de2c4a..41f1de2c4a 100644
--- a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
+++ b/uitest/src/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/uitest/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
index 177471e3c8..177471e3c8 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java
+++ b/uitest/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.html b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.html
index 2cc695e4fa..2cc695e4fa 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.html
+++ b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
index 44f40a7d78..44f40a7d78 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java
+++ b/uitest/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java b/uitest/src/com/vaadin/tests/layouts/TestLayoutPerformance.java
index 85ecf2897b..85ecf2897b 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java
+++ b/uitest/src/com/vaadin/tests/layouts/TestLayoutPerformance.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.html b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
index e1034c2f0e..e1034c2f0e 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
+++ b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
index 8786ae282c..8786ae282c 100644
--- a/tests/testbench/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
+++ b/uitest/src/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
index ef24150762..ef24150762 100644
--- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
index 906de9bb77..906de9bb77 100644
--- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
+++ b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
index f3d4029663..f3d4029663 100644
--- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
+++ b/uitest/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
index c96d542a4c..c96d542a4c 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
index d53fda1748..8da94feb7f 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.layouts.layouttester;
 import java.util.Date;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.SystemError;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.Resource;
+import com.vaadin.server.SystemError;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Alignment;
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
index ab4bb265c5..0042f0ba11 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.layouts.layouttester;
 
 import com.vaadin.Application;
+import com.vaadin.server.Resource;
+import com.vaadin.server.SystemError;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.SystemError;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Alignment;
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
index 8408aba9fd..8408aba9fd 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
index e31ecc2498..e31ecc2498 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java b/uitest/src/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
index c998ce458a..c998ce458a 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index be32ca513b..3e668289fe 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.layouts.layouttester;
 
 import com.vaadin.Application;
+import com.vaadin.server.Resource;
+import com.vaadin.server.SystemError;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.SystemError;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Alignment;
diff --git a/tests/testbench/com/vaadin/tests/m.gif b/uitest/src/com/vaadin/tests/m.gif
index 2201bdfc1c..2201bdfc1c 100644
--- a/tests/testbench/com/vaadin/tests/m.gif
+++ b/uitest/src/com/vaadin/tests/m.gif
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
index 08556e99d0..4e8d2f3160 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
@@ -19,7 +19,7 @@ package com.vaadin.tests.minitutorials.v7a1;
 import com.vaadin.data.fieldgroup.BeanFieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
index f3e6653288..f55377b3f4 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/BasicApplication.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.minitutorials.v7a1;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
index 39b11177b6..a96b8957c6 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.minitutorials.v7a1;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.TextField;
 
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
index eb34747450..2cbff64117 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.minitutorials.v7a1;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.TextField;
 
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
index 12938f9f12..9da6a75a45 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DefineUITheme.java
@@ -17,7 +17,7 @@
 package com.vaadin.tests.minitutorials.v7a1;
 
 import com.vaadin.annotations.Theme;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
index b0a33c14cf..ba3042c48e 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java
@@ -18,9 +18,9 @@ package com.vaadin.tests.minitutorials.v7a1;
 
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedRequest.BrowserDetails;
-import com.vaadin.terminal.gwt.server.WebBrowser;
+import com.vaadin.server.WebBrowser;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedRequest.BrowserDetails;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
index f3e96aaafc..4fd9c1187b 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/DynamicImageUI.java
@@ -8,10 +8,10 @@ import java.net.URL;
 import javax.imageio.ImageIO;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Embedded;
 
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
index 9830ee6aeb..e0f53935c7 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FindCurrentUI.java
@@ -17,7 +17,7 @@
 package com.vaadin.tests.minitutorials.v7a1;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
index 2a8b228bc3..a3de39c039 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.minitutorials.v7a1;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.PropertyId;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.TextArea;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
index 5dd9322364..ae8de83e30 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
@@ -4,7 +4,7 @@ import java.text.NumberFormat;
 import java.util.Locale;
 
 import com.vaadin.data.util.converter.StringToNumberConverter;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Table;
 
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
index 38a578189a..f0df14e158 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.minitutorials.v7a1;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
index 9d968f360a..1e32916d0b 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.minitutorials.v7a1;
 
 import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.StringToIntegerConverter;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
index d82f4b1382..2c7d6ee7ba 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MultiTabApplication.java
@@ -16,8 +16,8 @@
 
 package com.vaadin.tests.minitutorials.v7a1;
 
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.UI;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
index 17c37f2115..17c37f2115 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
index 483f841ce2..483f841ce2 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
index 67a795a314..5834f320af 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
@@ -4,7 +4,7 @@ import java.util.Locale;
 
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.Converter.ConversionException;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
index c2f983c9bb..4beb321cd1 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
@@ -22,7 +22,7 @@ import javax.validation.constraints.Size;
 
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.validator.BeanValidator;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.TextField;
 
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
index 042c02316f..cde71d5ac2 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java
@@ -16,9 +16,9 @@
 
 package com.vaadin.tests.minitutorials.v7a1;
 
-import com.vaadin.terminal.Page.FragmentChangedEvent;
-import com.vaadin.terminal.Page.FragmentChangedListener;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.Page.FragmentChangedEvent;
+import com.vaadin.server.Page.FragmentChangedListener;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
index 4a689d8c12..dc6c8ce7bf 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a1/UsingXyzWhenInitializing.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.minitutorials.v7a1;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
index 061eb7a23e..061eb7a23e 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateComponent.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
index 1bde122dbf..8ad3b037b3 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ComponentInStateUI.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.minitutorials.v7a2;
 
 import com.vaadin.annotations.Widgetset;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
index 292ac62125..292ac62125 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponent.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
index d9091e4287..62088f304d 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyComponentUI.java
@@ -17,7 +17,7 @@
 package com.vaadin.tests.minitutorials.v7a2;
 
 import com.vaadin.annotations.Widgetset;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
index 0608cc092e..0306555a5d 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java
@@ -17,10 +17,10 @@
 package com.vaadin.tests.minitutorials.v7a2;
 
 import com.google.gwt.user.client.Element;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-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.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.SimpleManagedLayout;
+import com.vaadin.client.ui.layout.ElementResizeEvent;
+import com.vaadin.client.ui.layout.ElementResizeListener;
 
 /**
  * Mini tutorial code for
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java
index 7818ac4f99..7818ac4f99 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
index f906661b51..cf0c5a3e2b 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java
@@ -16,8 +16,7 @@
 
 package com.vaadin.tests.minitutorials.v7a2;
 
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.gwt.server.ResourceReference;
+import com.vaadin.server.Resource;
 import com.vaadin.tests.widgetset.client.minitutorials.v7a2.ResourceInStateState;
 import com.vaadin.ui.AbstractComponent;
 
@@ -28,10 +27,10 @@ public class ResourceInStateComponent extends AbstractComponent {
     }
 
     public void setMyIcon(Resource icon) {
-        getState().setMyIcon(new ResourceReference(icon));
+        setResource(ResourceInStateState.MY_ICON_RESOURCE, icon);
     }
 
     public Resource getMyIcon() {
-        return ResourceReference.getResource(getState().getMyIcon());
+        return getResource(ResourceInStateState.MY_ICON_RESOURCE);
     }
 }
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
index 37f4255cdd..35062fbf0c 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/ResourceInStateUI.java
@@ -17,8 +17,8 @@
 package com.vaadin.tests.minitutorials.v7a2;
 
 import com.vaadin.annotations.Widgetset;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
index 5c519dbdfe..5c519dbdfe 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java
index 8c728548c0..76e332504c 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerUI.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.minitutorials.v7a2;
 import java.util.Random;
 
 import com.vaadin.annotations.Widgetset;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/Analytics.java
index 6f2be3c7d7..86a1908a2b 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/Analytics.java
@@ -17,8 +17,8 @@
 package com.vaadin.tests.minitutorials.v7a3;
 
 import com.vaadin.annotations.JavaScript;
-import com.vaadin.terminal.AbstractJavaScriptExtension;
-import com.vaadin.terminal.gwt.server.ClientConnector;
+import com.vaadin.server.AbstractJavaScriptExtension;
+import com.vaadin.server.ClientConnector;
 import com.vaadin.ui.UI;
 
 @JavaScript("analytics_connector.js")
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
index bae3c4fc9c..95055cd207 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/AnalyticsUI.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.minitutorials.v7a3;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
index 8e415e4e68..8e415e4e68 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
index 5b6a693389..5b6a693389 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
index eb1277851c..eb1277851c 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
index 093f3269e0..b84cb5e599 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/ComplexTypesUI.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.minitutorials.v7a3;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 public class ComplexTypesUI extends UI {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/Flot.java
index 816c60cfe5..816c60cfe5 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/Flot.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java
index 3802fe6e3f..3802fe6e3f 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
index a1c04db794..a1c04db794 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
index 02bd8a7cce..5e519d1b7a 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptUI.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.minitutorials.v7a3;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI;
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotState.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotState.java
index eb9e2f64ce..eb9e2f64ce 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotState.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/FlotState.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButton.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButton.java
index 366dab16f0..366dab16f0 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButton.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButton.java
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java b/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
index 9384394870..793ba3dee8 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/RedButtonUI.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.minitutorials.v7a3;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 public class RedButtonUI extends UI {
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js b/uitest/src/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js
index 4eadff5803..4eadff5803 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js b/uitest/src/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js
index 496afce432..496afce432 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/flot_connector.js b/uitest/src/com/vaadin/tests/minitutorials/v7a3/flot_connector.js
index 5e572a4c72..5e572a4c72 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/flot_connector.js
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/flot_connector.js
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js b/uitest/src/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js
index f38561ba10..f38561ba10 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js
diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/redbutton.css b/uitest/src/com/vaadin/tests/minitutorials/v7a3/redbutton.css
index a70cf5e575..a70cf5e575 100644
--- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/redbutton.css
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7a3/redbutton.css
diff --git a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.html b/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.html
index da050b3aaa..da050b3aaa 100644
--- a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.html
+++ b/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.html
diff --git a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java b/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.java
index 2f5c1177fa..ebccba74fb 100644
--- a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java
+++ b/uitest/src/com/vaadin/tests/requesthandlers/AppResource404.java
@@ -1,10 +1,8 @@
 package com.vaadin.tests.requesthandlers;
 
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.integration.FlagSeResource;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Link;
 
 public class AppResource404 extends TestBase {
@@ -12,21 +10,12 @@ public class AppResource404 extends TestBase {
     @Override
     protected void setup() {
         // Add one existing resource
-        final FlagSeResource resource = new FlagSeResource(this);
+        final FlagSeResource resource = new FlagSeResource();
         resource.setCacheTime(0);
-        addResource(resource);
 
         addComponent(new Link("Existing resource", resource));
         addComponent(new Link("Non-existing resource", new ExternalResource(
                 getURL().toString() + "APP/12341234/")));
-
-        addComponent(new Button("Remove existing resrouce",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        removeResource(resource);
-                    }
-                }));
     }
 
     @Override
diff --git a/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.html b/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.html
new file mode 100644
index 0000000000..f400bacffa
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.html
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.resources.ConnectorResourceTest?restartApplication</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.java b/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.java
new file mode 100644
index 0000000000..c8d711f0b2
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/resources/ConnectorResourceTest.java
@@ -0,0 +1,71 @@
+package com.vaadin.tests.resources;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.HashMap;
+
+import javax.imageio.ImageIO;
+
+import com.vaadin.server.DynamicConnectorResource;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Embedded;
+
+public class ConnectorResourceTest extends AbstractTestUI {
+
+    private static final String DYNAMIC_IMAGE_NAME = "requestImage.png";
+
+    @Override
+    protected void setup(WrappedRequest request) {
+        addComponent(new Embedded(DYNAMIC_IMAGE_NAME,
+                new DynamicConnectorResource(this, DYNAMIC_IMAGE_NAME)));
+        addComponent(new Embedded("Dynamic text", new DynamicConnectorResource(
+                this, DYNAMIC_IMAGE_NAME, new HashMap<String, String>() {
+                    {
+                        put("text", "Dynamic%20text");
+                    }
+                })));
+    }
+
+    @Override
+    protected String getTestDescription() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean handleConnectorRequest(WrappedRequest request,
+            WrappedResponse response, String path) throws IOException {
+        if (DYNAMIC_IMAGE_NAME.equals(path)) {
+            // Create an image, draw the "text" parameter to it and output it to
+            // the browser.
+            String text = request.getParameter("text");
+            if (text == null) {
+                text = DYNAMIC_IMAGE_NAME;
+            }
+            BufferedImage bi = getImage(text);
+            response.setContentType("image/png");
+            ImageIO.write(bi, "png", response.getOutputStream());
+
+            return true;
+        } else {
+            return super.handleConnectorRequest(request, response, path);
+        }
+    }
+
+    private BufferedImage getImage(String text) {
+        BufferedImage bi = new BufferedImage(150, 30,
+                BufferedImage.TYPE_3BYTE_BGR);
+        bi.getGraphics()
+                .drawChars(text.toCharArray(), 0, text.length(), 10, 20);
+        return bi;
+    }
+
+}
diff --git a/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java b/uitest/src/com/vaadin/tests/resources/DownloadLargeFileResource.java
index cb8963c3d4..d799e1a8d4 100644
--- a/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java
+++ b/uitest/src/com/vaadin/tests/resources/DownloadLargeFileResource.java
@@ -5,7 +5,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import com.vaadin.terminal.FileResource;
+import com.vaadin.server.FileResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -51,7 +51,7 @@ public class DownloadLargeFileResource extends TestBase {
                 os.write(b);
             }
             os.close();
-            hugeFileResource = new FileResource(hugeFile, this);
+            hugeFileResource = new FileResource(hugeFile);
         } catch (IOException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
diff --git a/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java b/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java
index b6dbcfca97..eb8559f746 100644
--- a/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java
+++ b/uitest/src/com/vaadin/tests/resources/NonExistingFileResource.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.resources;
 
 import java.io.File;
 
-import com.vaadin.terminal.FileResource;
+import com.vaadin.server.FileResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -25,8 +25,7 @@ public class NonExistingFileResource extends TestBase {
             @Override
             public void buttonClick(ClickEvent event) {
                 FileResource res = new FileResource(new File(getContext()
-                        .getBaseDirectory() + "/" + filename),
-                        NonExistingFileResource.this);
+                        .getBaseDirectory() + "/" + filename));
                 getMainWindow().open(res);
 
             }
diff --git a/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java b/uitest/src/com/vaadin/tests/resources/ResourceDownload.java
index 8ab6ce153d..e323f5285b 100644
--- a/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java
+++ b/uitest/src/com/vaadin/tests/resources/ResourceDownload.java
@@ -4,8 +4,8 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 
-import com.vaadin.terminal.StreamResource;
-import com.vaadin.terminal.StreamResource.StreamSource;
+import com.vaadin.server.StreamResource;
+import com.vaadin.server.StreamResource.StreamSource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -74,7 +74,7 @@ public class ResourceDownload extends TestBase {
                     return null;
                 }
             }
-        }, filename + ".xls", this);
+        }, filename + ".xls");
         streamResource.setCacheTime(5000); // no cache (<=0) does not work with
         // IE8
         streamResource.setMIMEType("application/x-msexcel");
diff --git a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.html b/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.html
index 12228eb9f0..12228eb9f0 100644
--- a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.html
+++ b/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.html
diff --git a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java b/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.java
index b775c18f8f..3a5dd0a326 100644
--- a/tests/testbench/com/vaadin/tests/serialization/DelegateToWidgetTest.java
+++ b/uitest/src/com/vaadin/tests/serialization/DelegateToWidgetTest.java
@@ -17,7 +17,7 @@
 package com.vaadin.tests.serialization;
 
 import com.vaadin.annotations.Widgetset;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.TestingWidgetSet;
 import com.vaadin.tests.widgetset.server.DelegateToWidgetComponent;
diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.html b/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.html
index 70d0e905f5..70d0e905f5 100644
--- a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.html
+++ b/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.html
diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java b/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.java
index 0bb3b6c542..0d939a3d18 100644
--- a/tests/testbench/com/vaadin/tests/serialization/SerializerNamespaceTest.java
+++ b/uitest/src/com/vaadin/tests/serialization/SerializerNamespaceTest.java
@@ -17,7 +17,7 @@
 package com.vaadin.tests.serialization;
 
 import com.vaadin.annotations.Widgetset;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.TestingWidgetSet;
 import com.vaadin.tests.widgetset.server.DummyLabel;
diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.html b/uitest/src/com/vaadin/tests/serialization/SerializerTest.html
index 4417fabf14..4417fabf14 100644
--- a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.html
+++ b/uitest/src/com/vaadin/tests/serialization/SerializerTest.html
diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/com/vaadin/tests/serialization/SerializerTest.java
index 6ad6b6d530..cb9d9e997d 100644
--- a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java
+++ b/uitest/src/com/vaadin/tests/serialization/SerializerTest.java
@@ -27,9 +27,9 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import com.vaadin.annotations.Widgetset;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.Log;
 import com.vaadin.tests.widgetset.client.ComplexTestBean;
diff --git a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java b/uitest/src/com/vaadin/tests/themes/ButtonsTest.java
index 62160d233a..39b43f3516 100644
--- a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java
+++ b/uitest/src/com/vaadin/tests/themes/ButtonsTest.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.themes;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java
index 8c99fe6ebb..8c99fe6ebb 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1225.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java
index e11d6ea024..e11d6ea024 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1230.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java b/uitest/src/com/vaadin/tests/tickets/Ticket124.java
index 4bcf31a366..4bcf31a366 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket124.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java
index 6aa1c1752a..6aa1c1752a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1245.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1245.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java b/uitest/src/com/vaadin/tests/tickets/Ticket1365.java
index c617b07248..c617b07248 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1365.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java b/uitest/src/com/vaadin/tests/tickets/Ticket1368.java
index 16b47a1f31..16b47a1f31 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1368.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java
index e162e96bfa..e162e96bfa 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1397.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java
index d46a56f73a..d46a56f73a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1435.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java
index 1da3b5c290..1da3b5c290 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1444.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
index 3c766ef985..3c766ef985 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506.java b/uitest/src/com/vaadin/tests/tickets/Ticket1506.java
index 4788d27aad..4788d27aad 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1506.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java b/uitest/src/com/vaadin/tests/tickets/Ticket1506_Panel.java
index 9835e046dc..9835e046dc 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1506_Panel.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java b/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
index d6b53db7c7..d6b53db7c7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
index 7ac34dcd2e..7ac34dcd2e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java
index 8b1736637b..8b1736637b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1519.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1519.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java
index a511bae6d9..a511bae6d9 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1572.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java b/uitest/src/com/vaadin/tests/tickets/Ticket1581.java
index 5025605413..5025605413 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1581.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
index 92a480c3d2..37f9197285 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1589.java
@@ -11,11 +11,11 @@ import java.util.Date;
 import javax.imageio.ImageIO;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.DownloadStream;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
+import com.vaadin.server.DownloadStream;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.UI.LegacyWindow;
 
@@ -91,7 +91,7 @@ class MyDynamicResource implements RequestHandler {
                 downloadStream.setParameter("Content-Disposition",
                         "attachment; filename=\"downloadedPNG.png\"");
             }
-            downloadStream.writeTo(response);
+            downloadStream.writeResponse(request, response);
             return true;
         } catch (IOException e) {
             return false;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java
index 05fd0c3f1f..2f845a2264 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1598.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.Command;
 import com.vaadin.ui.MenuBar.MenuItem;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java b/uitest/src/com/vaadin/tests/tickets/Ticket161.java
index 4da1b3a6b4..4da1b3a6b4 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket161.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java
index bca902a73f..bca902a73f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1632.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java
index 55d08069ed..57d2ad73e5 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1659.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI.LegacyWindow;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java
index b07e9df0e5..1ef16afe95 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1663.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1663.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.terminal.SystemError;
+import com.vaadin.server.SystemError;
 import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.TextField;
 
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
index 99f213541a..99f213541a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1673.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java b/uitest/src/com/vaadin/tests/tickets/Ticket1710.java
index d3c2437219..c00e2f32eb 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1710.java
@@ -5,10 +5,10 @@ import java.util.Iterator;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.util.MethodProperty;
+import com.vaadin.server.SystemError;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.shared.ui.AlignmentInfo.Bits;
 import com.vaadin.shared.ui.MarginInfo;
-import com.vaadin.terminal.SystemError;
-import com.vaadin.terminal.ThemeResource;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java b/uitest/src/com/vaadin/tests/tickets/Ticket1737.java
index 364ad9b6cf..caf44865f9 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1737.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1737.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ClassResource;
-import com.vaadin.terminal.DownloadStream;
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.ClassResource;
+import com.vaadin.server.DownloadStream;
+import com.vaadin.server.Resource;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
@@ -12,8 +12,7 @@ import com.vaadin.ui.VerticalLayout;
 
 public class Ticket1737 extends Application.LegacyApplication {
 
-    Resource slowRes = new ClassResource(Ticket1737.class, "m-bullet-blue.gif",
-            this) {
+    Resource slowRes = new ClassResource(Ticket1737.class, "m-bullet-blue.gif") {
         @Override
         public DownloadStream getStream() {
             try {
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java
index eca0c0f833..eca0c0f833 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1767.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1767.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java b/uitest/src/com/vaadin/tests/tickets/Ticket1772.java
index a269acc1e0..a269acc1e0 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1772.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java b/uitest/src/com/vaadin/tests/tickets/Ticket1775.java
index ec28a957bb..ec28a957bb 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1775.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java
index 780215aa2a..a77e6e843a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1804.java
@@ -5,8 +5,8 @@ import java.util.LinkedList;
 
 import com.vaadin.data.Validator;
 import com.vaadin.data.util.MethodProperty;
+import com.vaadin.server.SystemError;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.SystemError;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java b/uitest/src/com/vaadin/tests/tickets/Ticket1805.java
index 7f5c684479..7f5c684479 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1805.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java b/uitest/src/com/vaadin/tests/tickets/Ticket1806.java
index 8359b024aa..8359b024aa 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1806.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java
index 824c58436f..824c58436f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1811.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java
index e16b2c2774..e16b2c2774 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1819.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
index f7329037cc..f7329037cc 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
index 039f867fff..039f867fff 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java
index 8bd4a77204..8bd4a77204 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1868.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1868.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java b/uitest/src/com/vaadin/tests/tickets/Ticket1869.java
index 741adecae4..741adecae4 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1869.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1869.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java b/uitest/src/com/vaadin/tests/tickets/Ticket1878.java
index 1b60d535cf..90a96ba0f1 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1878.java
@@ -7,9 +7,9 @@ import java.util.Random;
 import com.vaadin.Application;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.validator.StringLengthValidator;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java
index 136af23474..136af23474 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1900.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java b/uitest/src/com/vaadin/tests/tickets/Ticket1904.java
index f35463f6a8..f35463f6a8 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1904.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1904.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java
index 3b50804938..92102426ca 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1916.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1916.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.UI.LegacyWindow;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java
index 8e9e0cb0ba..8e9e0cb0ba 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1919.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
index 3d79de5d1d..ac5f990915 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1921.java
@@ -4,9 +4,9 @@ import java.io.IOException;
 import java.util.Map;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java
index 2bde4c95ec..2bde4c95ec 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1923.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1923.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java b/uitest/src/com/vaadin/tests/tickets/Ticket1925.java
index b5d938dbed..b5d938dbed 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1925.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1925.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java
index f65fbf9852..f65fbf9852 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1939.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java
index 1a27e1ad28..1a27e1ad28 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1940.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1940.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java
index 9bf4ddee51..9bf4ddee51 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1953.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1953.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java
index 9440855bbe..9440855bbe 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java
index c5442e6473..c5442e6473 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_2.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java
index 63634259a3..7258971f50 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1966_3.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1966_3.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Panel;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java
index b10ccea992..78c09d8914 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1969.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.UserError;
 import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java
index b07a997f8f..b07a997f8f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1970.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java
index 6b406a2f89..6b406a2f89 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1972.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1972.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java
index a3365bedcb..a3365bedcb 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java b/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java
index 27c3d4a8a7..27c3d4a8a7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1973_2.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
index fda75a409e..9c6dd8c272 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1975.java
@@ -5,7 +5,7 @@ import java.io.File;
 import java.io.FileInputStream;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
+import com.vaadin.server.WebApplicationContext;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java b/uitest/src/com/vaadin/tests/tickets/Ticket1982.java
index a5953d22af..a5953d22af 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1982.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java
index 0d6a21faac..7b544ec9b0 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1983.java
@@ -4,7 +4,7 @@ import com.vaadin.Application;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalSplitPanel;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java
index fd6665b2fe..fd6665b2fe 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1986.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1986.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java
index ed60c89c16..ed60c89c16 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1991.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1991.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java b/uitest/src/com/vaadin/tests/tickets/Ticket1995.java
index 04ce9c712d..04ce9c712d 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1995.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java b/uitest/src/com/vaadin/tests/tickets/Ticket20.java
index ea610a3db8..ea610a3db8 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket20.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java b/uitest/src/com/vaadin/tests/tickets/Ticket2001.java
index 8ff3d952c4..8ff3d952c4 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2001.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java
index aeaf3bfb33..aeaf3bfb33 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2002.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2002.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java
index 0342b87e68..fcffbc01bf 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2007.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.UI.LegacyWindow;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java
index e79ec8905e..e79ec8905e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2009.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java b/uitest/src/com/vaadin/tests/tickets/Ticket2011.java
index 754036cd5b..754036cd5b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2011.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2011.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java
index bf909acb35..bf909acb35 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2014.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java
index c23f031a91..c23f031a91 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2021.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java
index ea142b7e9e..ea142b7e9e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2022.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2022.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java b/uitest/src/com/vaadin/tests/tickets/Ticket2023.java
index c6b2c0f28a..c6b2c0f28a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2023.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java b/uitest/src/com/vaadin/tests/tickets/Ticket2024.java
index b1a8b64931..b1a8b64931 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2024.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2024.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java
index 0b72073bec..0b72073bec 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2026.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2026.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java
index ba8936adfa..5900c76706 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2029.java
@@ -5,7 +5,7 @@ import java.util.Random;
 import com.vaadin.Application;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java b/uitest/src/com/vaadin/tests/tickets/Ticket2037.java
index da47f796a5..da47f796a5 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2037.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java b/uitest/src/com/vaadin/tests/tickets/Ticket2038.java
index c4714783a0..c4714783a0 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2038.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java
index a7ca7b179f..a7ca7b179f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2040.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2040.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java b/uitest/src/com/vaadin/tests/tickets/Ticket2042.java
index 49e999a601..49e999a601 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2042.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java
index 2efc66556d..8a10067455 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2043.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2043.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.UI.LegacyWindow;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java
index 110db06800..5ac0480fe2 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2048.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java
index 1660f00d88..1660f00d88 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2051.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2051.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java
index 362a763c2f..31973e4c92 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2053.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java b/uitest/src/com/vaadin/tests/tickets/Ticket2060.java
index c9e91930bf..c9e91930bf 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2060.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java
index 4d6549bfbf..4d6549bfbf 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java
index 186522db15..87d92ad9f6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061b.java
@@ -5,7 +5,7 @@ import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.HierarchicalContainer;
-import com.vaadin.terminal.Sizeable;
+import com.vaadin.server.Sizeable;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java
index 5cb041788b..5cb041788b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2061c.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java
index 9b2fe05514..9b2fe05514 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2062.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2062.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java
index 87bea00023..87bea00023 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2083.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2083.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java
index e48aae7d9f..2f311b9428 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2090.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI.LegacyWindow;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java
index aabafadb13..53f2aac79e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2095.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2095.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.UI.LegacyWindow;
 
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java
index a8a3e22d2b..a8a3e22d2b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2098.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2098.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java
index 2bba0504a5..2bba0504a5 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2099.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java
index c29eaaf453..c29eaaf453 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2101.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2101.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java
index 576fe03d87..576fe03d87 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2103.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2103.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java
index 4da938351d..0dba639712 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2104.java
@@ -6,8 +6,8 @@ import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ExternalResource;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
index 9d6e198f03..9d6e198f03 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2106.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java
index 37d570546b..37d570546b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2107.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java
index d5b5041060..fb0d62ba85 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2117.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ExternalResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java
index 621b744aa8..38cc567295 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2119.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.tickets;
 import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.ExternalResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
index bc1f886418..bc1f886418 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java
index d49c73ea5f..d49c73ea5f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2126.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java b/uitest/src/com/vaadin/tests/tickets/Ticket2151.java
index 721bdf3c9f..721bdf3c9f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2151.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2151.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2157.java b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java
index b8f75fc279..b8f75fc279 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2157.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2157.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2178.java b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java
index e64db69ced..e64db69ced 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2178.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2178.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java
index 622488dc0f..622488dc0f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2179.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2180.java b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java
index fb9332d100..fb9332d100 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2180.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2180.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
index ceba214dc5..b67fad52c0 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2181.java
@@ -6,8 +6,8 @@ import java.util.Random;
 import java.util.Set;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.UserError;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.UserError;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2186.java b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java
index 50b8a1f113..50b8a1f113 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2186.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2186.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java
index 24c4d6e8b9..24c4d6e8b9 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2204.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
index f622f093ee..f622f093ee 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209.java
index ecad9a950a..ecad9a950a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java
index 6eec0a7704..6eec0a7704 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java
index 7f4082d0f8..7f4082d0f8 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2209OL2.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2215.java b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java
index f7099d88f4..f7099d88f4 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2215.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2215.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java
index e3f1516fb8..e3f1516fb8 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2221.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2222.java b/uitest/src/com/vaadin/tests/tickets/Ticket2222.java
index 14024fda8b..14024fda8b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2222.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2222.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
index f9c670708e..f9c670708e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2231.java b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java
index 21994bff60..21994bff60 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2231.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2231.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2232.java b/uitest/src/com/vaadin/tests/tickets/Ticket2232.java
index d71134696f..d71134696f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2232.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2232.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2234.java b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java
index ccda59bb6a..ccda59bb6a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2234.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2234.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2235.java b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java
index fba82956e0..fba82956e0 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2235.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2235.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java
index bb16a40cd7..bb16a40cd7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2240.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
index 77fbfefe1a..77fbfefe1a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2242.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java b/uitest/src/com/vaadin/tests/tickets/Ticket2244.java
index 495e3de26a..495e3de26a 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2244.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2245.java b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java
index ab474fe6f7..ab474fe6f7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2245.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2245.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java b/uitest/src/com/vaadin/tests/tickets/Ticket2267.java
index 41843a9742..41843a9742 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2267.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2271.java b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java
index 91fb51034b..91fb51034b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2271.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2271.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java b/uitest/src/com/vaadin/tests/tickets/Ticket2282.java
index 976b06fe32..976b06fe32 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2282.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2283.java b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java
index 5576e48fba..5576e48fba 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2283.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2283.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java b/uitest/src/com/vaadin/tests/tickets/Ticket2287.java
index 59fc174215..59fc174215 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2287.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java
index c715fafd74..c715fafd74 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2289.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
index e732ea09e0..ce7960a169 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2292.java
@@ -10,11 +10,11 @@ import java.io.IOException;
 import javax.imageio.ImageIO;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.DownloadStream;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
+import com.vaadin.server.DownloadStream;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
@@ -87,7 +87,8 @@ public class Ticket2292 extends com.vaadin.Application.LegacyApplication
             // Return a stream from the buffer.
             ByteArrayInputStream istream = new ByteArrayInputStream(
                     imagebuffer.toByteArray());
-            new DownloadStream(istream, null, null).writeTo(response);
+            new DownloadStream(istream, null, null).writeResponse(request,
+                    response);
             return true;
         } catch (IOException e) {
             return false;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2294.java b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java
index 053534191b..053534191b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2294.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2294.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2296.java b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java
index d059b96953..d059b96953 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2296.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2296.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2297.java b/uitest/src/com/vaadin/tests/tickets/Ticket2297.java
index 073126ae07..073126ae07 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2297.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2297.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2303.java b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java
index fb1c5440ad..fb1c5440ad 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2303.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2303.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java
index ccef7a9a92..ccef7a9a92 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2304.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java
index 24fbd7a968..24fbd7a968 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2310.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2319.java b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java
index 438d2ff286..438d2ff286 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2319.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2319.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2323.java b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java
index d7b8db86bd..d7b8db86bd 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2323.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2323.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2325.java b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java
index ecc897d4ba..ecc897d4ba 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2325.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2325.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java
index 2ce42376f9..2ce42376f9 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2329.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java b/uitest/src/com/vaadin/tests/tickets/Ticket2337.java
index 3ac381b2d1..3ac381b2d1 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2337.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2339.java b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java
index ce884bada7..ce884bada7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2339.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2339.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2341.java b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java
index aa2eefcb7e..aa2eefcb7e 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2341.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2341.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2344.java b/uitest/src/com/vaadin/tests/tickets/Ticket2344.java
index befad78a73..befad78a73 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2344.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2344.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java b/uitest/src/com/vaadin/tests/tickets/Ticket2347.java
index 582b9a95ee..582b9a95ee 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2347.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2364.java b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java
index f7d6f61110..f7d6f61110 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2364.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2364.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java
index b191901356..b191901356 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2365.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2398.java b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java
index f5b68800e6..f5b68800e6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2398.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2398.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2404.java b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java
index 30f9d04d3b..30f9d04d3b 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2404.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2404.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java
index a76f3a711f..8be6a13e9f 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2405.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2405.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Embedded;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java
index dd42727591..dd42727591 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2406.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2407.java b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java
index df2ae47acd..df2ae47acd 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2407.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2407.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2411.java b/uitest/src/com/vaadin/tests/tickets/Ticket2411.java
index 2c59493e0c..2c59493e0c 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2411.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2411.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java
index f52c1b1ccc..f52c1b1ccc 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2415.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2420.java b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java
index 5d15107053..5d15107053 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2420.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2420.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2425.java b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java
index 140fa6f2b6..140fa6f2b6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2425.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2425.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java
index fee74b73f7..fee74b73f7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2426.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java b/uitest/src/com/vaadin/tests/tickets/Ticket2431.java
index cb9eb449bf..cb9eb449bf 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2431.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2432.java b/uitest/src/com/vaadin/tests/tickets/Ticket2432.java
index f21e6a6752..f21e6a6752 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2432.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2432.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2434.java b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java
index 6401a98763..6401a98763 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2434.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2434.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java
index 5367c24b01..5367c24b01 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2436.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java
index 998fe75f8c..998fe75f8c 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2526.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2742.java b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java
index 733f6ac6f6..733f6ac6f6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2742.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2742.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2901.java b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java
index c4352abefe..c4352abefe 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2901.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2901.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java
index 0cd43533fd..0cd43533fd 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2998.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java
index 7973ffa496..7973ffa496 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket3146.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java b/uitest/src/com/vaadin/tests/tickets/Ticket34.java
index 67db77a5af..fd5e9c6005 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket34.java
@@ -4,8 +4,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Page.FragmentChangedEvent;
+import com.vaadin.server.Page;
+import com.vaadin.server.Page.FragmentChangedEvent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Component;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket5053.java b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java
index 6f8ade15c4..6f8ade15c4 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket5053.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5053.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket5157.java b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java
index 3102a0a56c..3102a0a56c 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket5157.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5157.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java
index 92cd0290d6..92cd0290d6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket5952.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java b/uitest/src/com/vaadin/tests/tickets/Ticket6002.java
index 887652aee7..887652aee7 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket6002.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java b/uitest/src/com/vaadin/tests/tickets/Ticket677.java
index 1c66f67ca1..1c66f67ca1 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket677.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java b/uitest/src/com/vaadin/tests/tickets/Ticket695.java
index e539f999b3..e539f999b3 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket695.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java b/uitest/src/com/vaadin/tests/tickets/Ticket736.java
index 1176e87bb4..417ee86fac 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket736.java
@@ -5,7 +5,7 @@ import com.vaadin.data.Validator;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.util.MethodProperty;
 import com.vaadin.data.validator.IntegerValidator;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java b/uitest/src/com/vaadin/tests/tickets/Ticket8291.java
index 24a98d42e3..0280db0693 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket8291.java
@@ -7,7 +7,7 @@ import java.util.List;
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java b/uitest/src/com/vaadin/tests/tickets/Ticket846.java
index 407663c6c6..407663c6c6 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket846.java
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java b/uitest/src/com/vaadin/tests/tickets/Ticket932.java
index c12e2fcad3..c12e2fcad3 100644
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket932.java
diff --git a/tests/testbench/com/vaadin/tests/util/Address.java b/uitest/src/com/vaadin/tests/util/Address.java
index 5ef0669e1b..5ef0669e1b 100644
--- a/tests/testbench/com/vaadin/tests/util/Address.java
+++ b/uitest/src/com/vaadin/tests/util/Address.java
diff --git a/tests/testbench/com/vaadin/tests/util/AlwaysFailValidator.java b/uitest/src/com/vaadin/tests/util/AlwaysFailValidator.java
index ddb58999ee..ddb58999ee 100644
--- a/tests/testbench/com/vaadin/tests/util/AlwaysFailValidator.java
+++ b/uitest/src/com/vaadin/tests/util/AlwaysFailValidator.java
diff --git a/tests/testbench/com/vaadin/tests/util/Log.java b/uitest/src/com/vaadin/tests/util/Log.java
index 7a58a4c80c..7a58a4c80c 100644
--- a/tests/testbench/com/vaadin/tests/util/Log.java
+++ b/uitest/src/com/vaadin/tests/util/Log.java
diff --git a/tests/testbench/com/vaadin/tests/util/LogPrintWriter.java b/uitest/src/com/vaadin/tests/util/LogPrintWriter.java
index 1f07a9c7ae..1f07a9c7ae 100644
--- a/tests/testbench/com/vaadin/tests/util/LogPrintWriter.java
+++ b/uitest/src/com/vaadin/tests/util/LogPrintWriter.java
diff --git a/tests/testbench/com/vaadin/tests/util/LoremIpsum.java b/uitest/src/com/vaadin/tests/util/LoremIpsum.java
index 3dc775badf..3dc775badf 100644
--- a/tests/testbench/com/vaadin/tests/util/LoremIpsum.java
+++ b/uitest/src/com/vaadin/tests/util/LoremIpsum.java
diff --git a/tests/testbench/com/vaadin/tests/util/Millionaire.java b/uitest/src/com/vaadin/tests/util/Millionaire.java
index 44d4def416..44d4def416 100644
--- a/tests/testbench/com/vaadin/tests/util/Millionaire.java
+++ b/uitest/src/com/vaadin/tests/util/Millionaire.java
diff --git a/tests/testbench/com/vaadin/tests/util/Person.java b/uitest/src/com/vaadin/tests/util/Person.java
index 72f6b7d20d..72f6b7d20d 100644
--- a/tests/testbench/com/vaadin/tests/util/Person.java
+++ b/uitest/src/com/vaadin/tests/util/Person.java
diff --git a/tests/testbench/com/vaadin/tests/util/PersonContainer.java b/uitest/src/com/vaadin/tests/util/PersonContainer.java
index a3cf28b083..a3cf28b083 100644
--- a/tests/testbench/com/vaadin/tests/util/PersonContainer.java
+++ b/uitest/src/com/vaadin/tests/util/PersonContainer.java
diff --git a/tests/testbench/com/vaadin/tests/util/PortableRandom.java b/uitest/src/com/vaadin/tests/util/PortableRandom.java
index b66bdfdcaf..b66bdfdcaf 100644
--- a/tests/testbench/com/vaadin/tests/util/PortableRandom.java
+++ b/uitest/src/com/vaadin/tests/util/PortableRandom.java
diff --git a/tests/testbench/com/vaadin/tests/util/Product.java b/uitest/src/com/vaadin/tests/util/Product.java
index 46ec1935b0..46ec1935b0 100644
--- a/tests/testbench/com/vaadin/tests/util/Product.java
+++ b/uitest/src/com/vaadin/tests/util/Product.java
diff --git a/tests/testbench/com/vaadin/tests/util/Role.java b/uitest/src/com/vaadin/tests/util/Role.java
index 83f63db4ab..83f63db4ab 100644
--- a/tests/testbench/com/vaadin/tests/util/Role.java
+++ b/uitest/src/com/vaadin/tests/util/Role.java
diff --git a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/com/vaadin/tests/util/SampleDirectory.java
index 788415d0fd..ef20da788d 100644
--- a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java
+++ b/uitest/src/com/vaadin/tests/util/SampleDirectory.java
@@ -19,8 +19,8 @@ package com.vaadin.tests.util;
 import java.io.File;
 
 import com.vaadin.Application;
+import com.vaadin.server.SystemError;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.SystemError;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.UI;
diff --git a/tests/testbench/com/vaadin/tests/util/TestClickListener.java b/uitest/src/com/vaadin/tests/util/TestClickListener.java
index b9f6d66b3e..b9f6d66b3e 100644
--- a/tests/testbench/com/vaadin/tests/util/TestClickListener.java
+++ b/uitest/src/com/vaadin/tests/util/TestClickListener.java
diff --git a/tests/testbench/com/vaadin/tests/util/TestUtils.java b/uitest/src/com/vaadin/tests/util/TestUtils.java
index 62f2cc0be3..62f2cc0be3 100644
--- a/tests/testbench/com/vaadin/tests/util/TestUtils.java
+++ b/uitest/src/com/vaadin/tests/util/TestUtils.java
diff --git a/tests/testbench/com/vaadin/tests/util/User.java b/uitest/src/com/vaadin/tests/util/User.java
index 003f485017..003f485017 100644
--- a/tests/testbench/com/vaadin/tests/util/User.java
+++ b/uitest/src/com/vaadin/tests/util/User.java
diff --git a/tests/testbench/com/vaadin/tests/vaadin_spin.swf b/uitest/src/com/vaadin/tests/vaadin_spin.swf
index 9e58ce29c6..9e58ce29c6 100644
--- a/tests/testbench/com/vaadin/tests/vaadin_spin.swf
+++ b/uitest/src/com/vaadin/tests/vaadin_spin.swf
diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html b/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html
index e6fafb14fa..e6fafb14fa 100644
--- a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html
+++ b/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.html
diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java b/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
index c197bbde5d..bc3d88e2bb 100644
--- a/tests/testbench/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
+++ b/uitest/src/com/vaadin/tests/vaadincontext/BootstrapModifyUI.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.vaadincontext;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 
 public class BootstrapModifyUI extends AbstractTestUI {
diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java b/uitest/src/com/vaadin/tests/vaadincontext/TestAddonContextListener.java
index 9cd67e24b6..9f3019b21c 100644
--- a/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java
+++ b/uitest/src/com/vaadin/tests/vaadincontext/TestAddonContextListener.java
@@ -19,12 +19,12 @@ package com.vaadin.tests.vaadincontext;
 import org.jsoup.nodes.Element;
 import org.jsoup.parser.Tag;
 
-import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse;
-import com.vaadin.terminal.gwt.server.BootstrapListener;
-import com.vaadin.terminal.gwt.server.BootstrapPageResponse;
-import com.vaadin.terminal.gwt.server.BootstrapResponse;
-import com.vaadin.terminal.gwt.server.AddonContextEvent;
-import com.vaadin.terminal.gwt.server.AddonContextListener;
+import com.vaadin.server.AddonContextEvent;
+import com.vaadin.server.AddonContextListener;
+import com.vaadin.server.BootstrapFragmentResponse;
+import com.vaadin.server.BootstrapListener;
+import com.vaadin.server.BootstrapPageResponse;
+import com.vaadin.server.BootstrapResponse;
 import com.vaadin.ui.UI;
 
 public class TestAddonContextListener implements AddonContextListener {
diff --git a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html b/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
index c8fcb20411..c8fcb20411 100644
--- a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
+++ b/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.html
diff --git a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java b/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
index 379ab2cfcd..379ab2cfcd 100644
--- a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
+++ b/uitest/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java
diff --git a/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java b/uitest/src/com/vaadin/tests/validation/RequiredErrorMessage.java
index b63527ad60..b63527ad60 100644
--- a/tests/testbench/com/vaadin/tests/validation/RequiredErrorMessage.java
+++ b/uitest/src/com/vaadin/tests/validation/RequiredErrorMessage.java
diff --git a/tests/testbench/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java b/uitest/src/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
index 6e806b60f4..6e806b60f4 100644
--- a/tests/testbench/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
+++ b/uitest/src/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
diff --git a/tests/testbench/com/vaadin/tests/validation/TestValidators.java b/uitest/src/com/vaadin/tests/validation/TestValidators.java
index 746a460da8..746a460da8 100644
--- a/tests/testbench/com/vaadin/tests/validation/TestValidators.java
+++ b/uitest/src/com/vaadin/tests/validation/TestValidators.java
diff --git a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html b/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
index 62d972e89f..62d972e89f 100644
--- a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
+++ b/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html
diff --git a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java b/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
index dd1732023b..dd1732023b 100644
--- a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
+++ b/uitest/src/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
index bd91d05b02..c127d3bb21 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
+++ b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
@@ -2,5 +2,5 @@
 	<!-- WS Compiler: manually edited  -->
 
 	<!-- Inherit the DefaultWidgetSet -->
-	<inherits name="com.vaadin.terminal.gwt.DefaultWidgetSet" />
+	<inherits name="com.vaadin.DefaultWidgetSet" />
 </module>
diff --git a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.java b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.java
index 0464a53a95..0464a53a95 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.java
+++ b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
index a10d318991..9d28b52ae5 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java
@@ -18,10 +18,10 @@ package com.vaadin.tests.widgetset.client;
 
 import com.google.gwt.dom.client.DivElement;
 import com.google.gwt.dom.client.Document;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.Util;
+import com.vaadin.client.extensions.AbstractExtensionConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ServerConnector;
-import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector;
 import com.vaadin.tests.extensions.BasicExtension;
 
 @Connect(BasicExtension.class)
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java b/uitest/src/com/vaadin/tests/widgetset/client/ComplexTestBean.java
index af3a278559..af3a278559 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/ComplexTestBean.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/DelegateConnector.java
index c711be232f..c46a5aa007 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/DelegateConnector.java
@@ -16,8 +16,8 @@
 
 package com.vaadin.tests.widgetset.client;
 
+import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 import com.vaadin.tests.widgetset.server.DelegateToWidgetComponent;
 
 @Connect(DelegateToWidgetComponent.class)
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateState.java b/uitest/src/com/vaadin/tests/widgetset/client/DelegateState.java
index e9ac8a1e61..e9ac8a1e61 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/DelegateState.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/DelegateWidget.java
index 4776eced9a..4776eced9a 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/DelegateWidget.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/DelegateWidget.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/DummyLabelConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
index bf3a472b33..601ec6db1f 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/DummyLabelConnector.java
@@ -16,10 +16,10 @@
 
 package com.vaadin.tests.widgetset.client;
 
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.label.VLabel;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.label.VLabel;
 import com.vaadin.tests.widgetset.server.DummyLabel;
 
 /**
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/LabelState.java b/uitest/src/com/vaadin/tests/widgetset/client/LabelState.java
index 91a269e33f..91a269e33f 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/LabelState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/LabelState.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
index 35c15aaef8..bc514047f9 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java
@@ -15,9 +15,9 @@
  */
 package com.vaadin.tests.widgetset.client;
 
+import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.label.VLabel;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.label.VLabel;
 import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent;
 
 @Connect(MissingFromDefaultWidgetsetComponent.class)
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
index 9fb6807bb7..7783178a3b 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
@@ -26,12 +26,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.extensions.AbstractExtensionConnector;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.terminal.gwt.client.communication.RpcProxy;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector;
 import com.vaadin.tests.widgetset.server.SerializerTestExtension;
 
 @Connect(SerializerTestExtension.class)
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
index eb3a20e90e..0d89976ca0 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/SerializerTestRpc.java
@@ -74,6 +74,7 @@ public interface SerializerTestRpc extends ServerRpc, ClientRpc {
     public void sendWrappedGenerics(
             Map<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>> generics);
 
-    public void sendEnum(ContentMode contentMode, ContentMode[] array, List<ContentMode> list);
+    public void sendEnum(ContentMode contentMode, ContentMode[] array,
+            List<ContentMode> list);
 
 }
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SimpleTestBean.java b/uitest/src/com/vaadin/tests/widgetset/client/SimpleTestBean.java
index 97e333c393..97e333c393 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/SimpleTestBean.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/SimpleTestBean.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
index 8bffbb8e5e..8bffbb8e5e 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
index 4a4d21cf4f..76dbdd5370 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java
@@ -16,12 +16,12 @@
 package com.vaadin.tests.widgetset.client.helloworldfeature;
 
 import com.google.gwt.user.client.Window;
+import com.vaadin.client.ServerConnector;
+import com.vaadin.client.Util;
+import com.vaadin.client.VConsole;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.extensions.AbstractExtensionConnector;
 import com.vaadin.shared.ui.Connect;
-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.RpcProxy;
-import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector;
 import com.vaadin.tests.extensions.HelloWorldExtension;
 
 @Connect(HelloWorldExtension.class)
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
index 968eb463e2..968eb463e2 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
index be90719279..be90719279 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
index 63947c2435..63947c2435 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
index 9c0d454e19..35469e7501 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java
@@ -17,10 +17,10 @@
 package com.vaadin.tests.widgetset.client.minitutorials.v7a2;
 
 import com.google.gwt.user.client.ui.Label;
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 import com.vaadin.tests.minitutorials.v7a2.ComponentInStateComponent;
 
 @Connect(ComponentInStateComponent.class)
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java
index f85d67da4b..f85d67da4b 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
index 3a6aab617a..c80a4c88f0 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java
@@ -3,12 +3,12 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.Window;
+import com.vaadin.client.MouseEventDetailsBuilder;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.Connect;
-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.ui.AbstractComponentConnector;
 import com.vaadin.tests.minitutorials.v7a2.MyComponent;
 
 @Connect(MyComponent.class)
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java
index 5571ffb701..5571ffb701 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
index 8b68331f30..8b68331f30 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
index 729a867f16..729a867f16 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentWidget.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
index 57579d3ec2..93b12dbc68 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
@@ -17,10 +17,9 @@
 package com.vaadin.tests.widgetset.client.minitutorials.v7a2;
 
 import com.google.gwt.user.client.ui.Image;
-import com.vaadin.shared.communication.URLReference;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 import com.vaadin.tests.minitutorials.v7a2.ResourceInStateComponent;
 
 @Connect(ResourceInStateComponent.class)
@@ -28,10 +27,10 @@ public class ResourceInStateConnector extends AbstractComponentConnector {
     @Override
     public void onStateChanged(StateChangeEvent stateChangeEvent) {
         super.onStateChanged(stateChangeEvent);
+        String icon = getResourceUrl(ResourceInStateState.MY_ICON_RESOURCE);
 
-        URLReference icon = getState().getMyIcon();
         if (icon != null) {
-            getWidget().setUrl(icon.getURL());
+            getWidget().setUrl(icon);
         } else {
             getWidget().setUrl("");
         }
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java
new file mode 100644
index 0000000000..728f0ba5e1
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java
@@ -0,0 +1,7 @@
+package com.vaadin.tests.widgetset.client.minitutorials.v7a2;
+
+import com.vaadin.shared.ComponentState;
+
+public class ResourceInStateState extends ComponentState {
+    public static final String MY_ICON_RESOURCE = "myIcon";
+}
\ No newline at end of file
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java
index 6ec0a6da7c..6ec0a6da7c 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/VWidgetContainer.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
index 7905de89f2..fc65f6b2ae 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java
@@ -4,10 +4,10 @@ import java.util.List;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
+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.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
-import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.tests.minitutorials.v7a2.WidgetContainer;
 
 @Connect(WidgetContainer.class)
diff --git a/tests/testbench/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java b/uitest/src/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
index 34c9699f7f..34c9699f7f 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/DelegateToWidgetComponent.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/server/DummyLabel.java b/uitest/src/com/vaadin/tests/widgetset/server/DummyLabel.java
index bda36d64a8..bda36d64a8 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/server/DummyLabel.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/DummyLabel.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java b/uitest/src/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
index 5987bfb539..5987bfb539 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/MissingFromDefaultWidgetsetComponent.java
diff --git a/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java b/uitest/src/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
index 8cdcc0fe3a..978ed80ed5 100644
--- a/tests/testbench/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
+++ b/uitest/src/com/vaadin/tests/widgetset/server/SerializerTestExtension.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.widgetset.server;
 
-import com.vaadin.terminal.AbstractExtension;
+import com.vaadin.server.AbstractExtension;
 import com.vaadin.tests.widgetset.client.ComplexTestBean;
 import com.vaadin.tests.widgetset.client.SerializerTestRpc;
 
diff --git a/tests/test.xml b/uitest/test.xml
index 9b879ec789..9b879ec789 100644
--- a/tests/test.xml
+++ b/uitest/test.xml
diff --git a/tests/vaadin-server.xml b/uitest/vaadin-server.xml
index d4d23581ec..d4d23581ec 100644
--- a/tests/vaadin-server.xml
+++ b/uitest/vaadin-server.xml