1051 files changed, 6747 insertions, 6748 deletions
diff --git a/WebContent/ITMILL/readme.txt b/WebContent/ITMILL/readme.txt
index aa7a826a66..4e4d0030aa 100644
--- a/WebContent/ITMILL/readme.txt
+++ b/WebContent/ITMILL/readme.txt
@@ -20,7 +20,7 @@ command below in the top project directory:
 
   ant -f build-widgetsets.xml
 
-See build-widgetsets.xml, com.itmill.toolkit.demo.colorpicker package, and the
+See build-widgetsets.xml, com.vaadin.demo.colorpicker package, and the
 Reference Manual for more information regarding widget sets.
 
 ---------------------------
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index b62d534178..bf763441c7 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -6,13 +6,13 @@
         <portlet>
                 <portlet-name>PortletDemoPortlet</portlet-name>
                 <display-name>IT Mill Toolkit PortletDemo</display-name>
-                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
                         <value>PortletDemo</value>
                 </init-param>
                 
-                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
+                <init-param><name>widgetset</name><value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -40,13 +40,13 @@
         <portlet>
                 <portlet-name>SimpleReserverPortlet</portlet-name>
                 <display-name>IT Mill Toolkit SimpleReserver</display-name>
-                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
                         <value>SimpleReserver</value>
                 </init-param>
                 <init-param><name>style</name><value>style=height:400px</value></init-param>
-                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
+                <init-param><name>widgetset</name><value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -74,13 +74,13 @@
         <portlet>
                 <portlet-name>FeatureBrowserPortlet</portlet-name>
                 <display-name>IT Mill Toolkit FeatureBrowser</display-name>
-                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
                         <value>FeatureBrowser</value>
                 </init-param>
                 <init-param><name>style</name><value>style=height:650px</value></init-param>
-                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
+                <init-param><name>widgetset</name><value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -108,13 +108,13 @@
         <portlet>
                 <portlet-name>ChatServletPortlet</portlet-name>
                 <display-name>IT Mill Toolkit ChatServlet</display-name>
-                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
                         <value>chat</value>
                 </init-param>
                 
-                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
+                <init-param><name>widgetset</name><value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
@@ -142,13 +142,13 @@
         <portlet>
                 <portlet-name>BrowserDemoPortlet</portlet-name>
                 <display-name>IT Mill Toolkit BrowserDemo</display-name>
-                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>
+                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
                         <value>BrowserDemo</value>
                 </init-param>
                 <init-param><name>style</name><value>style=height:650px</value></init-param>
-                <init-param><name>widgetset</name><value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
+                <init-param><name>widgetset</name><value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</value></init-param>
                 <supports>
                         <mime-type>text/html</mime-type>
                         <portlet-mode>view</portlet-mode>
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 636295d26b..7a882bfafc 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -34,218 +34,218 @@
 
 	<servlet>
 		<servlet-name>ITMillToolkitApplicationRunner</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>
 	</servlet>
 
 
 	<servlet>
 		<servlet-name>RobustnessSimple</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.robustness.RobustnessSimple</param-value>
+			<param-value>com.vaadin.tests.robustness.RobustnessSimple</param-value>
 		</init-param>
 	</servlet>
 
 
 	<servlet>
 		<servlet-name>DemoTestBench</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.testbench.TestBench</param-value>
+			<param-value>com.vaadin.demo.testbench.TestBench</param-value>
 		</init-param>
 	</servlet>
 	<servlet>
 		<servlet-name>TestForNativeWindowing</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.TestForNativeWindowing</param-value>
+			<param-value>com.vaadin.tests.TestForNativeWindowing</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>TestSplitPanel</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.TestSplitPanel</param-value>
+			<param-value>com.vaadin.tests.TestSplitPanel</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>FeatureBrowser</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.featurebrowser.FeatureBrowser</param-value>
+			<param-value>com.vaadin.demo.featurebrowser.FeatureBrowser</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>Sampler</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.sampler.SamplerApplication</param-value>
+			<param-value>com.vaadin.demo.sampler.SamplerApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet</param-value>
+			<param-value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</param-value>
 		</init-param>
 
 	</servlet>
 
 	<servlet>
 		<servlet-name>AddressBook</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.tutorial.addressbook.AddressBookApplication</param-value>
+			<param-value>com.vaadin.demo.tutorial.addressbook.AddressBookApplication</param-value>
 		</init-param>
 
 	</servlet>
 
 	<servlet>
 		<servlet-name>TestBench</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.TestBench</param-value>
+			<param-value>com.vaadin.tests.TestBench</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>RandomLayoutStress</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.RandomLayoutStress</param-value>
+			<param-value>com.vaadin.tests.RandomLayoutStress</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>Reservr</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.ReservationApplication</param-value>
+			<param-value>com.vaadin.demo.reservation.ReservationApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>SimpleReserver</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.simple.SimpleReserver</param-value>
+			<param-value>com.vaadin.demo.reservation.simple.SimpleReserver</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>CalendarDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.CalendarDemo</param-value>
+			<param-value>com.vaadin.demo.reservation.CalendarDemo</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>CustomLayoutDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.CustomLayoutDemo</param-value>
+			<param-value>com.vaadin.tests.CustomLayoutDemo</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>LayoutDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.LayoutDemo</param-value>
+			<param-value>com.vaadin.tests.LayoutDemo</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>ToolkitTunesLayout</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.ToolkitTunesLayout</param-value>
+			<param-value>com.vaadin.demo.ToolkitTunesLayout</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>Coverflow</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.coverflow.CoverflowApplication</param-value>
+			<param-value>com.vaadin.demo.coverflow.CoverflowApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet</param-value>
+			<param-value>com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>FeaturesApplication</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.featurebrowser.FeaturesApplication</param-value>
+			<param-value>com.vaadin.tests.featurebrowser.FeaturesApplication</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>Parameters</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.Parameters</param-value>
+			<param-value>com.vaadin.tests.Parameters</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>UpgradingSample</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.UpgradingSample</param-value>
+			<param-value>com.vaadin.tests.UpgradingSample</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>QueryContainerDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.QueryContainerDemo</param-value>
+			<param-value>com.vaadin.tests.QueryContainerDemo</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>TreeFilesystemContainer</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.TreeFilesystemContainer</param-value>
+			<param-value>com.vaadin.tests.TreeFilesystemContainer</param-value>
 		</init-param>
 		<!--
 			Set this property if demo cannot access context base directory
@@ -260,10 +260,10 @@
 
 	<servlet>
 		<servlet-name>TreeFilesystem</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.TreeFilesystem</param-value>
+			<param-value>com.vaadin.tests.TreeFilesystem</param-value>
 		</init-param>
 		<!--
 			Set this property if demo cannot access context base directory
@@ -278,68 +278,68 @@
 
 	<servlet>
 		<servlet-name>ModalWindow</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.ModalWindow</param-value>
+			<param-value>com.vaadin.tests.ModalWindow</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>HelloWorld</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.HelloWorld</param-value>
+			<param-value>com.vaadin.demo.HelloWorld</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>Calc</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.Calc</param-value>
+			<param-value>com.vaadin.demo.Calc</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>ColorPickerApplication</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.colorpicker.ColorPickerApplication</param-value>
+			<param-value>com.vaadin.demo.colorpicker.ColorPickerApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
+			<param-value>com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>BookTestServlet</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.book.BookTestApplication</param-value>
+			<param-value>com.vaadin.tests.book.BookTestApplication</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>WindowTestServlet</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.book.WindowTestApplication</param-value>
+			<param-value>com.vaadin.tests.book.WindowTestApplication</param-value>
 		</init-param>
 	</servlet>
 
 	<servlet>
 		<servlet-name>ChatServlet</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.tests.book.ChatApplication</param-value>
+			<param-value>com.vaadin.tests.book.ChatApplication</param-value>
 		</init-param>
 	</servlet>
 
diff --git a/WebContent/multiapp.html b/WebContent/multiapp.html
index 58aaf88346..97d1484a5c 100644
--- a/WebContent/multiapp.html
+++ b/WebContent/multiapp.html
@@ -27,7 +27,7 @@
 			
 		}};
 </script>
-<script language='javascript' src='/ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet.nocache.js'></script>
+<script language='javascript' src='/ITMILL/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/com.vaadin.terminal.gwt.DefaultWidgetSet.nocache.js'></script>
 <link REL="stylesheet" TYPE="text/css" HREF="/ITMILL/themes/example/styles.css">
 </head>
 <body>
diff --git a/build/build.xml b/build/build.xml
index b5684fc2ab..6782d56bb9 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -683,9 +683,9 @@
 				<include name="**/*" />
 			</fileset>
 		</copy>
-		<java classname="com.itmill.toolkit.buildhelpers.PortletConfigurationGenerator" failonerror="yes" fork="yes" maxmemory="512m">
+		<java classname="com.vaadin.buildhelpers.PortletConfigurationGenerator" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="${output-dir}/WebContent/WEB-INF" />
-			<arg value="com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet" />
+			<arg value="com.vaadin.demo.sampler.gwt.SamplerWidgetSet" />
 			<classpath>
 				<pathelement location="build/buildhelpers/" />
 			</classpath>
@@ -721,7 +721,7 @@
 		<echo>Combining default themes css files</echo>
 		<!-- ensure buildhelpers are compiled -->
 		<javac source="1.5" target="1.5" srcdir="build/buildhelpers" />
-		<java classname="com.itmill.toolkit.buildhelpers.CompileDefaultTheme" failonerror="yes" fork="yes">
+		<java classname="com.vaadin.buildhelpers.CompileDefaultTheme" failonerror="yes" fork="yes">
 			<classpath>
 				<pathelement location="build/buildhelpers" />
 			</classpath>
@@ -739,11 +739,11 @@
 
 	<target name="compile-widgetset-default">
 		<echo>Compiling src (client-side)</echo>
-		<echo>com.itmill.toolkit.terminal.gwt.DefaultWidgetSet</echo>
+		<echo>com.vaadin.terminal.gwt.DefaultWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
 			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-			<arg value="com.itmill.toolkit.terminal.gwt.DefaultWidgetSet" />
+			<arg value="com.vaadin.terminal.gwt.DefaultWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
             <jvmarg value="-Xss8M"/>
@@ -765,11 +765,11 @@
 		<condition property="googlemaps-jar" value="lib/reservr/gwt-maps.jar">
 			<available file="lib/reservr/gwt-maps.jar" />
 		</condition>
-		<echo>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</echo>
+		<echo>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
 			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-			<arg value="com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet" />
+			<arg value="com.vaadin.demo.reservation.gwt.ReservationWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
             <jvmarg value="-Xss8M"/>
@@ -790,11 +790,11 @@
 
     <!-- Building Sampler for installation package is disabled. -->
 	<target name="compile-widgetset-sampler" unless="build.sampler.disabled">
-		<echo>com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet</echo>
+		<echo>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
 			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-			<arg value="com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet" />
+			<arg value="com.vaadin.demo.sampler.gwt.SamplerWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
             <jvmarg value="-Xss8M"/>
@@ -812,11 +812,11 @@
 	</target>
 	
 	<target name="compile-widgetset-coverflow">
-		<echo>com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet</echo>
+		<echo>com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
 			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-			<arg value="com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet" />
+			<arg value="com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
             <jvmarg value="-Xss8M"/>
@@ -834,11 +834,11 @@
 	</target>
 	
 	<target name="compile-widgetset-colorpicker">
-		<echo>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</echo>
+		<echo>com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="512m">
 			<arg value="-out" />
 			<arg value="${output-dir}/WebContent/ITMILL/widgetsets" />
-			<arg value="com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet" />
+			<arg value="com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet" />
 			<arg value="-style" />
 			<arg value="OBF" />
             <jvmarg value="-Xss8M"/>
@@ -940,7 +940,7 @@
 			</fileset>
 			<fileset dir="${output-dir}/WebContent">
 				<patternset>
-					<include name="ITMILL/widgetsets/com.itmill.toolkit.terminal.gwt.DefaultWidgetSet/**/*" />
+					<include name="ITMILL/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" />
 					<include name="ITMILL/themes/default/**/*" />
 				</patternset>
 			</fileset>
@@ -1188,13 +1188,13 @@
     </target>
 
     <target name="ant-tests">
-        <echo>##teamcity[testSuiteStarted name='com.itmill.toolkit.tests.test-framework']</echo>
+        <echo>##teamcity[testSuiteStarted name='com.vaadin.tests.test-framework']</echo>
 
         <!-- A smoke test for testing the testing framework. -->
         <echo>##teamcity[testStarted name='testingSmoketest']</echo>
         <echo>##teamcity[testStdOut name='testingSmoketest' out='Here be some text related to the test.]</echo>
         <echo>##teamcity[testFinished name='testingSmoketest']</echo>
 
-        <echo>##teamcity[testSuiteFinished name='com.itmill.toolkit.tests.test-framework']</echo>
+        <echo>##teamcity[testSuiteFinished name='com.vaadin.tests.test-framework']</echo>
     </target>
 </project>
diff --git a/build/buildhelpers/com/itmill/toolkit/buildhelpers/CompileDefaultTheme.java b/build/buildhelpers/com/itmill/toolkit/buildhelpers/CompileDefaultTheme.java
index 0a1d768e42..0ed54a91cd 100644
--- a/build/buildhelpers/com/itmill/toolkit/buildhelpers/CompileDefaultTheme.java
+++ b/build/buildhelpers/com/itmill/toolkit/buildhelpers/CompileDefaultTheme.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.buildhelpers;
+package com.vaadin.buildhelpers;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/build/buildhelpers/com/itmill/toolkit/buildhelpers/PortletConfigurationGenerator.java b/build/buildhelpers/com/itmill/toolkit/buildhelpers/PortletConfigurationGenerator.java
index 1eae91789b..638e85b304 100644
--- a/build/buildhelpers/com/itmill/toolkit/buildhelpers/PortletConfigurationGenerator.java
+++ b/build/buildhelpers/com/itmill/toolkit/buildhelpers/PortletConfigurationGenerator.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.itmill.toolkit.buildhelpers;
+package com.vaadin.buildhelpers;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -43,7 +43,7 @@ public class PortletConfigurationGenerator {
     private static final String PORTLET_XML_SECTION = "        <portlet>\n"
             + "                <portlet-name>%PORTLETNAME%</portlet-name>\n"
             + "                <display-name>IT Mill Toolkit %NAME%</display-name>\n"
-            + "                <portlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationPortlet</portlet-class>\n"
+            + "                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>\n"
             + "                <init-param>\n"
             + "                        <name>application</name>\n"
             + "                        <value>%URL%</value>\n"
diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index ae6bfab666..b499aa3973 100644
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -47,7 +47,7 @@
 	-->
 	<servlet>
 		<servlet-name>ITMillToolkitApplicationRunner</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>applicationRunner</param-name>
 			<param-value>true</param-value>
@@ -57,96 +57,96 @@
 	<!--  Feature Browser demo application -->
 	<servlet>
 		<servlet-name>FeatureBrowser</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.featurebrowser.FeatureBrowser</param-value>
+			<param-value>com.vaadin.demo.featurebrowser.FeatureBrowser</param-value>
 		</init-param>
 	</servlet>
 
 	<!--  Sampler demo application -->
 	<servlet>
 		<servlet-name>Sampler</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.sampler.SamplerApplication</param-value>
+			<param-value>com.vaadin.demo.sampler.SamplerApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.sampler.gwt.SamplerWidgetSet</param-value>
+			<param-value>com.vaadin.demo.sampler.gwt.SamplerWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<!--  AddressBook demo application -->
 	<servlet>
 		<servlet-name>AddressBook</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.tutorial.addressbook.AddressBookApplication</param-value>
+			<param-value>com.vaadin.demo.tutorial.addressbook.AddressBookApplication</param-value>
 		</init-param>
 	</servlet>
 
 	<!--  Reservr demo application -->
 	<servlet>
 		<servlet-name>Reservr</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.ReservationApplication</param-value>
+			<param-value>com.vaadin.demo.reservation.ReservationApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<!-- Version of the Reservr to be run  as a portlet -->
 	<servlet>
 		<servlet-name>SimpleReserver</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.simple.SimpleReserver</param-value>
+			<param-value>com.vaadin.demo.reservation.simple.SimpleReserver</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<!-- Calendar demo application (shown in Windowed demos) -->
 	<servlet>
 		<servlet-name>CalendarDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.CalendarDemo</param-value>
+			<param-value>com.vaadin.demo.reservation.CalendarDemo</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet</param-value>
+			<param-value>com.vaadin.demo.reservation.gwt.ReservationWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<!-- Hello world demo application -->
 	<servlet>
 		<servlet-name>HelloWorld</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.HelloWorld</param-value>
+			<param-value>com.vaadin.demo.HelloWorld</param-value>
 		</init-param>
 	</servlet>
 
 	<!-- Calculator demo application -->
 	<servlet>
 		<servlet-name>Calc</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.Calc</param-value>
+			<param-value>com.vaadin.demo.Calc</param-value>
 		</init-param>
 	</servlet>
 
@@ -156,48 +156,48 @@
 	-->
 	<servlet>
 		<servlet-name>ColorPickerApplication</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.colorpicker.ColorPickerApplication</param-value>
+			<param-value>com.vaadin.demo.colorpicker.ColorPickerApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
+			<param-value>com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
 	<!-- Portlet demo application -->
 	<servlet>
 		<servlet-name>PortletDemo</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.PortletDemo</param-value>
+			<param-value>com.vaadin.demo.PortletDemo</param-value>
 		</init-param>
 	</servlet>
 
 	<!--  Layout demo (ToolkitTunes) -->
 	<servlet>
 		<servlet-name>ToolkitTunesLayout</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.ToolkitTunesLayout</param-value>
+			<param-value>com.vaadin.demo.ToolkitTunesLayout</param-value>
 		</init-param>
 	</servlet>
 
 	<!--  Coverflow demo -->
 	<servlet>
 		<servlet-name>Coverflow</servlet-name>
-		<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
-			<param-value>com.itmill.toolkit.demo.coverflow.CoverflowApplication</param-value>
+			<param-value>com.vaadin.demo.coverflow.CoverflowApplication</param-value>
 		</init-param>
 		<init-param>
 			<param-name>widgetset</param-name>
-			<param-value>com.itmill.toolkit.demo.coverflow.gwt.CoverflowWidgetSet</param-value>
+			<param-value>com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet</param-value>
 		</init-param>
 	</servlet>
 
diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml
index 2a82e5fd4b..79e7512658 100644
--- a/build/package/build-widgetset.xml
+++ b/build/package/build-widgetset.xml
@@ -74,12 +74,12 @@ See configure target to adjust this buildfile.
 	
 	<!-- NOTE: Modify this example to compile your own widgetset  -->
 	<target name="compile-widgetset" depends="init">
-		<echo>Compiling com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet.</echo>
+		<echo>Compiling com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet.</echo>
 		<echo>Modify this example ant-script to compile your own widgetsets.</echo>
 		<java classname="com.google.gwt.dev.GWTCompiler" failonerror="yes" fork="yes" maxmemory="256m">
 			<arg value="-out" />
 			<arg value="${client-side-destination}" />
-			<arg value="com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet" />
+			<arg value="com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet" />
             <jvmarg value="-Xss1024k"/>
             <jvmarg value="-Djava.awt.headless=true"/>
 			<classpath>
diff --git a/build/package/build.xml b/build/package/build.xml
index 29c594f67b..8d72525a9d 100644
--- a/build/package/build.xml
+++ b/build/package/build.xml
@@ -13,7 +13,7 @@ Creates two packages:
 		<echo message="Creating two packages:" />
 		<echo message="1. WAR package that can be deployed to application server or servlet container." />
 		<echo message="2. JAR package which requires JRE only, includes embedded web server." />
-		<property name="server.main.class" value="com.itmill.toolkit.demo.DesktopServer" />
+		<property name="server.main.class" value="com.vaadin.demo.DesktopServer" />
 		<property name="webserver.jar" value="WebServer/winstone-0.9.9.jar" />
 		<property file="build.properties" />
 		<mkdir dir="build" />
diff --git a/build/package/eclipse-IT Mill Toolkit Web Mode-launch b/build/package/eclipse-IT Mill Toolkit Web Mode-launch
index ab9efe4b1d..30439e501f 100644
--- a/build/package/eclipse-IT Mill Toolkit Web Mode-launch
+++ b/build/package/eclipse-IT Mill Toolkit Web Mode-launch
@@ -18,6 +18,6 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit-examples/WebContent/WEB-INF/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.itmill.toolkit.launcher.ITMillToolkitWebMode"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.vaadin.launcher.ITMillToolkitWebMode"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="<eclipse-workspace-name></eclipse-workspace-name>"/>
 </launchConfiguration>
diff --git a/build/package/start.bat b/build/package/start.bat
index 004df31251..6399843e1d 100644
--- a/build/package/start.bat
+++ b/build/package/start.bat
@@ -1 +1 @@
-@java -cp "WebContent\demo\lib\jetty\jetty-6.1.7.jar;WebContent\demo\lib\jetty\jetty-util-6.1.7.jar;WebContent\demo\lib\jetty\servlet-api-2.5-6.1.7.jar;WebContent\WEB-INF\classes;WebContent\WEB-INF\src" com.itmill.toolkit.launcher.ITMillToolkitDesktopMode
+@java -cp "WebContent\demo\lib\jetty\jetty-6.1.7.jar;WebContent\demo\lib\jetty\jetty-util-6.1.7.jar;WebContent\demo\lib\jetty\servlet-api-2.5-6.1.7.jar;WebContent\WEB-INF\classes;WebContent\WEB-INF\src" com.vaadin.launcher.ITMillToolkitDesktopMode
diff --git a/build/package/start.sh b/build/package/start.sh
index febda97e4c..0dbf824d43 100644
--- a/build/package/start.sh
+++ b/build/package/start.sh
@@ -4,4 +4,4 @@ if [ "$1" != "" ] ; then
   cd $1
 fi
 
-java -cp WebContent/demo/lib/jetty/jetty-6.1.7.jar:WebContent/demo/lib/jetty/jetty-util-6.1.7.jar:WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar:WebContent/WEB-INF/classes:WebContent/WEB-INF/src com.itmill.toolkit.launcher.ITMillToolkitDesktopMode $ITMILLTOOLKIT_PARAMETERS
+java -cp WebContent/demo/lib/jetty/jetty-6.1.7.jar:WebContent/demo/lib/jetty/jetty-util-6.1.7.jar:WebContent/demo/lib/jetty/servlet-api-2.5-6.1.7.jar:WebContent/WEB-INF/classes:WebContent/WEB-INF/src com.vaadin.launcher.ITMillToolkitDesktopMode $ITMILLTOOLKIT_PARAMETERS
diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml
deleted file mode 100644
index b04380772e..0000000000
--- a/src/com/itmill/toolkit/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<module>
-	<!-- Inherit DefaultWidgetSet -->
-	<inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSet" /> 
-	
-	<!-- WidgetSet default theme -->	
-	<stylesheet src="colorpicker/styles.css"/>
-
-	<!-- Entry point -->
-	<entry-point class="com.itmill.toolkit.demo.colorpicker.gwt.client.ColorPickerWidgetSet"/>
-  
-</module>
diff --git a/src/com/itmill/toolkit/demo/coverflow/gwt/CoverflowWidgetSet.gwt.xml b/src/com/itmill/toolkit/demo/coverflow/gwt/CoverflowWidgetSet.gwt.xml
deleted file mode 100644
index a3a4e1d2ce..0000000000
--- a/src/com/itmill/toolkit/demo/coverflow/gwt/CoverflowWidgetSet.gwt.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<module>
-	<!-- Inherit the NoEntry version to avoid multiple entrypoints -->
-	<inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSetNoEntry" /> 
-
-	<!-- Entry point -->
-	<entry-point class="com.itmill.toolkit.demo.coverflow.gwt.client.CoverflowWidgetSet"/>
-  
-</module>
diff --git a/src/com/itmill/toolkit/Application.java b/src/com/vaadin/Application.java
index 049969f9ec..1c4cdd40d3 100644
--- a/src/com/itmill/toolkit/Application.java
+++ b/src/com/vaadin/Application.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit;
+package com.vaadin;
 
 import java.io.Serializable;
 import java.net.SocketException;
@@ -19,24 +19,24 @@ import java.util.Locale;
 import java.util.Properties;
 import java.util.Random;
 
-import com.itmill.toolkit.service.ApplicationContext;
-import com.itmill.toolkit.terminal.ApplicationResource;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.SystemError;
-import com.itmill.toolkit.terminal.Terminal;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.terminal.VariableOwner;
-import com.itmill.toolkit.terminal.gwt.server.ChangeVariablesErrorEvent;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.service.ApplicationContext;
+import com.vaadin.terminal.ApplicationResource;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.terminal.SystemError;
+import com.vaadin.terminal.Terminal;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.terminal.VariableOwner;
+import com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Window;
 
 /**
  * <p>
  * Base class required for all IT Mill Toolkit applications. This class provides
  * all the basic services required by the toolkit. These services allow external
- * discovery and manipulation of the user, {@link com.itmill.toolkit.ui.Window
+ * discovery and manipulation of the user, {@link com.vaadin.ui.Window
  * windows} and themes, and starting and stopping the application.
  * </p>
  * 
@@ -55,7 +55,7 @@ import com.itmill.toolkit.ui.Window;
  * </p>
  * 
  * <p>
- * See the class <code>com.itmill.toolkit.demo.HelloWorld</code> for a simple
+ * See the class <code>com.vaadin.demo.HelloWorld</code> for a simple
  * example of a fully working application.
  * </p>
  * 
@@ -76,7 +76,7 @@ import com.itmill.toolkit.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.itmill.toolkit.terminal.Terminal terminal} is used. The
+ * the {@link com.vaadin.terminal.Terminal terminal} is used. The
  * terminal always defines a default theme.
  * </p>
  * 
@@ -261,7 +261,7 @@ public abstract class Application implements URIHandler,
      * 
      * <p>
      * This implicitly invokes the
-     * {@link com.itmill.toolkit.ui.Window#setApplication(Application)} method.
+     * {@link com.vaadin.ui.Window#setApplication(Application)} method.
      * </p>
      * 
      * <p>
@@ -680,7 +680,7 @@ public abstract class Application implements URIHandler,
      * In most situations developers should NOT OVERRIDE this method. Instead
      * developers should implement and register uri handlers to windows.
      * 
-     * @see com.itmill.toolkit.terminal.URIHandler#handleURI(URL, String)
+     * @see com.vaadin.terminal.URIHandler#handleURI(URL, String)
      */
     public DownloadStream handleURI(URL context, String relativeUri) {
 
@@ -1081,7 +1081,7 @@ public abstract class Application implements URIHandler,
      * 
      * @param event
      *            the change event.
-     * @see com.itmill.toolkit.terminal.Terminal.ErrorListener#terminalError(com.itmill.toolkit.terminal.Terminal.ErrorEvent)
+     * @see com.vaadin.terminal.Terminal.ErrorListener#terminalError(com.vaadin.terminal.Terminal.ErrorEvent)
      */
     public void terminalError(Terminal.ErrorEvent event) {
         final Throwable t = event.getThrowable();
diff --git a/src/com/itmill/toolkit/annotations/AutoGenerated.java b/src/com/vaadin/annotations/AutoGenerated.java
index f2483f4146..87dbbf6d8b 100644
--- a/src/com/itmill/toolkit/annotations/AutoGenerated.java
+++ b/src/com/vaadin/annotations/AutoGenerated.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.annotations;
+package com.vaadin.annotations;
 
 /**
  * Marker annotation for automatically generated code elements.
diff --git a/src/com/itmill/toolkit/automatedtests/ComponentsInTable.java b/src/com/vaadin/automatedtests/ComponentsInTable.java
index 4ac547bb0e..ccbe29d2d5 100644
--- a/src/com/itmill/toolkit/automatedtests/ComponentsInTable.java
+++ b/src/com/vaadin/automatedtests/ComponentsInTable.java
@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests;
+package com.vaadin.automatedtests;
 
 import java.util.Date;
 import java.util.Random;
 import java.util.Vector;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Button.ClickEvent;
 
 @SuppressWarnings("serial")
 public class ComponentsInTable extends CustomComponent {
diff --git a/src/com/itmill/toolkit/automatedtests/SimplestApplication.java b/src/com/vaadin/automatedtests/SimplestApplication.java
index fef17670c1..7de7e0928e 100644
--- a/src/com/itmill/toolkit/automatedtests/SimplestApplication.java
+++ b/src/com/vaadin/automatedtests/SimplestApplication.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests;
+package com.vaadin.automatedtests;
 
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 @SuppressWarnings("serial")
-public class SimplestApplication extends com.itmill.toolkit.Application {
+public class SimplestApplication extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/AccordionExample.java b/src/com/vaadin/automatedtests/featurebrowser/AccordionExample.java
index 8fca3362be..05894392ef 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/AccordionExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/AccordionExample.java
@@ -1,16 +1,18 @@
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * Accordion is a derivative of TabSheet, a vertical tabbed layout that places
  * the tab contents between the vertical tabs.
  */
+@SuppressWarnings("serial")
 public class AccordionExample extends CustomComponent {
+
     public AccordionExample() {
         // Create a new accordion
         final Accordion accordion = new Accordion();
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/ButtonExample.java b/src/com/vaadin/automatedtests/featurebrowser/ButtonExample.java
index f9c3b18fea..0cd5ea05ec 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/ButtonExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/ButtonExample.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
-
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.automatedtests.featurebrowser;
+
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Shows a few variations of Buttons and Links.
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ClientCachingExample.java b/src/com/vaadin/automatedtests/featurebrowser/ClientCachingExample.java
index 38a759eb55..2012329df1 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/ClientCachingExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/ClientCachingExample.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * This example is a (simple) demonstration of client-side caching. The content
@@ -21,6 +21,7 @@ import com.itmill.toolkit.ui.VerticalLayout;
  * 
  * @author IT Mill Ltd.
  */
+@SuppressWarnings("serial")
 public class ClientCachingExample extends CustomComponent {
 
     private static final String msg = "This example is a (simple) demonstration of client-side caching."
@@ -52,6 +53,7 @@ public class ClientCachingExample extends CustomComponent {
         layout = new VerticalLayout();
         layout.setMargin(true);
         l = new Label("Slow label - until cached client side.") {
+
             @Override
             public void paintContent(PaintTarget target) throws PaintException {
                 try {
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/ComboBoxExample.java b/src/com/vaadin/automatedtests/featurebrowser/ComboBoxExample.java
index 130b9187b6..753c746fdb 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/ComboBoxExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/ComboBoxExample.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.Random;
 
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.AbstractSelect.Filtering;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.AbstractSelect.Filtering;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/EmbeddedBrowserExample.java b/src/com/vaadin/automatedtests/featurebrowser/EmbeddedBrowserExample.java
index 58f79b17c2..a62e120f46 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/EmbeddedBrowserExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/EmbeddedBrowserExample.java
@@ -2,25 +2,26 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window.Notification;
 
 /**
  * Demonstrates the use of Embedded and "suggesting" Select by creating a simple
  * web-browser. Note: does not check for recursion.
  * 
  * @author IT Mill Ltd.
- * @see com.itmill.toolkit.ui.Window
+ * @see com.vaadin.ui.Window
  */
+@SuppressWarnings("serial")
 public class EmbeddedBrowserExample extends VerticalLayout implements
         Select.ValueChangeListener {
 
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/FeatureBrowser.java b/src/com/vaadin/automatedtests/featurebrowser/FeatureBrowser.java
index 5e235aea6e..bc3983aea2 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/FeatureBrowser.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/FeatureBrowser.java
@@ -2,42 +2,42 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.util.HierarchicalContainer;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * 
  * @author IT Mill Ltd.
- * @see com.itmill.toolkit.ui.Window
+ * @see com.vaadin.ui.Window
  */
 @SuppressWarnings("serial")
-public class FeatureBrowser extends com.itmill.toolkit.Application implements
+public class FeatureBrowser extends com.vaadin.Application implements
         Select.ValueChangeListener {
 
     // Property IDs
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/FormExample.java b/src/com/vaadin/automatedtests/featurebrowser/FormExample.java
index 58e606b654..927f2ba978 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/FormExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/FormExample.java
@@ -1,20 +1,20 @@
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Item;
+import com.vaadin.data.Validator;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * This example demonstrates the most important features of the Form component:
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/GeneratedColumnExample.java b/src/com/vaadin/automatedtests/featurebrowser/GeneratedColumnExample.java
index 5b9e4d86eb..260716a31d 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/GeneratedColumnExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/GeneratedColumnExample.java
@@ -2,29 +2,29 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.Collection;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Vector;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Container.Indexed;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.AbstractField;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Container.Indexed;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.AbstractField;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 /**
  * This example demonstrates the use of generated columns in a table. Generated
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/JavaScriptAPIExample.java b/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java
index 44dad1a193..d902eb8323 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/JavaScriptAPIExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.Date;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * An example using a RichTextArea to edit a Label in XHTML-mode.
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/LabelExample.java b/src/com/vaadin/automatedtests/featurebrowser/LabelExample.java
index 0412a85104..37b946824d 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/LabelExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/LabelExample.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
 
 /**
  * Shows a few variations of Labels, including the effects of XHTML- and
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/LayoutExample.java b/src/com/vaadin/automatedtests/featurebrowser/LayoutExample.java
index 5229cfc25e..d5a0773fe2 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/LayoutExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/LayoutExample.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * A few examples of layout possibilities.
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java b/src/com/vaadin/automatedtests/featurebrowser/NotificationExample.java
index 98480baaa4..f3d46a7d00 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/NotificationExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/NotificationExample.java
@@ -2,26 +2,26 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.data.Item;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 /**
  * Demonstrates the use of Notifications.
  * 
  * @author IT Mill Ltd.
- * @see com.itmill.toolkit.ui.Window
+ * @see com.vaadin.ui.Window
  */
 public class NotificationExample extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/RichTextExample.java b/src/com/vaadin/automatedtests/featurebrowser/RichTextExample.java
index 2bced566a1..0fb21b2200 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/RichTextExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/RichTextExample.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
-
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.automatedtests.featurebrowser;
+
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * An example using a RichTextArea to edit a Label in XHTML-mode.
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/SelectExample.java b/src/com/vaadin/automatedtests/featurebrowser/SelectExample.java
index f1b305a4e2..ab6711efce 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/SelectExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/SelectExample.java
@@ -2,20 +2,20 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.ListSelect;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TwinColSelect;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TwinColSelect;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * Shows some basic fields for value input; TextField, DateField, Slider...
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/TableExample.java b/src/com/vaadin/automatedtests/featurebrowser/TableExample.java
index c67a4ef03b..b1b4fccf6f 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/TableExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/TableExample.java
@@ -2,23 +2,23 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.Iterator;
 import java.util.Random;
 import java.util.Set;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.event.Action;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Table example.
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java b/src/com/vaadin/automatedtests/featurebrowser/TreeExample.java
index c86e7bd94e..cf5a6a7f33 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/TreeExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/TreeExample.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
-
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
+package com.vaadin.automatedtests.featurebrowser;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.event.Action;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
 
 /**
  * Demonstrates basic Tree -functionality. Actions are used for add/remove item
@@ -39,6 +39,7 @@ public class TreeExample extends CustomComponent implements Action.Handler,
     public TreeExample() {
         final HorizontalLayout main = new HorizontalLayout();
         main.setWidth("100%");
+        main.setDebugId("mainLayout");
         main.setMargin(true);
         setCompositionRoot(main);
 
@@ -50,6 +51,7 @@ public class TreeExample extends CustomComponent implements Action.Handler,
         p.addComponent(new Label(desc));
         // Tree with a few items
         tree = new Tree();
+        tree.setDebugId("tree");
         tree.setImmediate(true);
         // we'll use a property for caption instead of the item id ("value"),
         // so that multiple items can have the same caption
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/ValueInputExample.java b/src/com/vaadin/automatedtests/featurebrowser/ValueInputExample.java
index 23ecc77b8c..14415d3794 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/ValueInputExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/ValueInputExample.java
@@ -2,21 +2,21 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.util.Date;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.InlineDateField;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Slider;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.InlineDateField;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Slider;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window.Notification;
 
 /**
  * Shows some basic fields for value input; TextField, DateField, Slider...
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/WindowingExample.java b/src/com/vaadin/automatedtests/featurebrowser/WindowingExample.java
index 76c711d73b..488d33702f 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/WindowingExample.java
+++ b/src/com/vaadin/automatedtests/featurebrowser/WindowingExample.java
@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.automatedtests.featurebrowser;
 
 import java.net.URL;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * @author marc
diff --git a/src/com/itmill/toolkit/automatedtests/robustness/Robustness.java b/src/com/vaadin/automatedtests/robustness/Robustness.java
index 14026aecd1..13add217cd 100644
--- a/src/com/itmill/toolkit/automatedtests/robustness/Robustness.java
+++ b/src/com/vaadin/automatedtests/robustness/Robustness.java
@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.robustness;
+package com.vaadin.automatedtests.robustness;
 
-import com.itmill.toolkit.automatedtests.util.Log;
-import com.itmill.toolkit.automatedtests.util.RandomComponents;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.automatedtests.util.Log;
+import com.vaadin.automatedtests.util.RandomComponents;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public abstract class Robustness extends com.itmill.toolkit.Application
+public abstract class Robustness extends com.vaadin.Application
         implements Button.ClickListener {
 
     static int totalCount = 0;
diff --git a/src/com/itmill/toolkit/automatedtests/robustness/RobustnessComplex.java b/src/com/vaadin/automatedtests/robustness/RobustnessComplex.java
index 1770cdd141..9e72af8b86 100644
--- a/src/com/itmill/toolkit/automatedtests/robustness/RobustnessComplex.java
+++ b/src/com/vaadin/automatedtests/robustness/RobustnessComplex.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.robustness;
+package com.vaadin.automatedtests.robustness;
 
-import com.itmill.toolkit.automatedtests.util.Log;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
+import com.vaadin.automatedtests.util.Log;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
 
 public class RobustnessComplex extends Robustness implements
         Button.ClickListener {
diff --git a/src/com/itmill/toolkit/automatedtests/util/DebugId.java b/src/com/vaadin/automatedtests/util/DebugId.java
index bcf9453109..8f2390933b 100644
--- a/src/com/itmill/toolkit/automatedtests/util/DebugId.java
+++ b/src/com/vaadin/automatedtests/util/DebugId.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.util;
+package com.vaadin.automatedtests.util;
 
 import java.io.Serializable;
 import java.util.HashMap;
 
-import com.itmill.toolkit.ui.Component;
+import com.vaadin.ui.Component;
 
 public class DebugId implements Serializable {
 
diff --git a/src/com/itmill/toolkit/automatedtests/util/Log.java b/src/com/vaadin/automatedtests/util/Log.java
index d7f98540d1..f9948af60e 100644
--- a/src/com/itmill/toolkit/automatedtests/util/Log.java
+++ b/src/com/vaadin/automatedtests/util/Log.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.util;
+package com.vaadin.automatedtests.util;
 
 import java.io.Serializable;
 import java.text.DateFormat;
diff --git a/src/com/itmill/toolkit/automatedtests/util/MultiListener.java b/src/com/vaadin/automatedtests/util/MultiListener.java
index f210099369..5f7df2ab99 100644
--- a/src/com/itmill/toolkit/automatedtests/util/MultiListener.java
+++ b/src/com/vaadin/automatedtests/util/MultiListener.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.util;
-
-import com.itmill.toolkit.data.Container.ItemSetChangeEvent;
-import com.itmill.toolkit.data.Container.ItemSetChangeListener;
-import com.itmill.toolkit.data.Container.PropertySetChangeEvent;
-import com.itmill.toolkit.data.Container.PropertySetChangeListener;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.automatedtests.util;
+
+import com.vaadin.data.Container.ItemSetChangeEvent;
+import com.vaadin.data.Container.ItemSetChangeListener;
+import com.vaadin.data.Container.PropertySetChangeEvent;
+import com.vaadin.data.Container.PropertySetChangeListener;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class MultiListener implements Button.ClickListener,
         PropertySetChangeListener, ItemSetChangeListener, ValueChangeListener {
diff --git a/src/com/itmill/toolkit/automatedtests/util/RandomComponents.java b/src/com/vaadin/automatedtests/util/RandomComponents.java
index 03b045e4a4..8ddafaf62b 100644
--- a/src/com/itmill/toolkit/automatedtests/util/RandomComponents.java
+++ b/src/com/vaadin/automatedtests/util/RandomComponents.java
@@ -2,45 +2,45 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.util;
+package com.vaadin.automatedtests.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Random;
 
-import com.itmill.toolkit.automatedtests.ComponentsInTable;
-import com.itmill.toolkit.data.Container.ItemSetChangeListener;
-import com.itmill.toolkit.data.Container.PropertySetChangeListener;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.demo.featurebrowser.ButtonExample;
-import com.itmill.toolkit.demo.featurebrowser.ClientCachingExample;
-import com.itmill.toolkit.demo.featurebrowser.ComboBoxExample;
-import com.itmill.toolkit.demo.featurebrowser.EmbeddedBrowserExample;
-import com.itmill.toolkit.demo.featurebrowser.LabelExample;
-import com.itmill.toolkit.demo.featurebrowser.LayoutExample;
-import com.itmill.toolkit.demo.featurebrowser.NotificationExample;
-import com.itmill.toolkit.demo.featurebrowser.RichTextExample;
-import com.itmill.toolkit.demo.featurebrowser.SelectExample;
-import com.itmill.toolkit.demo.featurebrowser.TableExample;
-import com.itmill.toolkit.demo.featurebrowser.TreeExample;
-import com.itmill.toolkit.demo.featurebrowser.ValueInputExample;
-import com.itmill.toolkit.demo.featurebrowser.WindowingExample;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.automatedtests.ComponentsInTable;
+import com.vaadin.data.Container.ItemSetChangeListener;
+import com.vaadin.data.Container.PropertySetChangeListener;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.demo.featurebrowser.ButtonExample;
+import com.vaadin.demo.featurebrowser.ClientCachingExample;
+import com.vaadin.demo.featurebrowser.ComboBoxExample;
+import com.vaadin.demo.featurebrowser.EmbeddedBrowserExample;
+import com.vaadin.demo.featurebrowser.LabelExample;
+import com.vaadin.demo.featurebrowser.LayoutExample;
+import com.vaadin.demo.featurebrowser.NotificationExample;
+import com.vaadin.demo.featurebrowser.RichTextExample;
+import com.vaadin.demo.featurebrowser.SelectExample;
+import com.vaadin.demo.featurebrowser.TableExample;
+import com.vaadin.demo.featurebrowser.TreeExample;
+import com.vaadin.demo.featurebrowser.ValueInputExample;
+import com.vaadin.demo.featurebrowser.WindowingExample;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TextField;
 
 public class RandomComponents implements Serializable {
 
diff --git a/src/com/itmill/toolkit/automatedtests/util/StatusServlet.java b/src/com/vaadin/automatedtests/util/StatusServlet.java
index caf44abc89..c0b3c7c118 100644
--- a/src/com/itmill/toolkit/automatedtests/util/StatusServlet.java
+++ b/src/com/vaadin/automatedtests/util/StatusServlet.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.util;
+package com.vaadin.automatedtests.util;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/src/com/itmill/toolkit/data/Buffered.java b/src/com/vaadin/data/Buffered.java
index 0550c49146..9bf3bba317 100644
--- a/src/com/itmill/toolkit/data/Buffered.java
+++ b/src/com/vaadin/data/Buffered.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.data.Validator.InvalidValueException;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.SystemError;
+import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.SystemError;
 
 /**
  * <p>
@@ -239,7 +239,7 @@ public interface Buffered extends Serializable {
          * are of level <code>ERROR</code>.
          * </p>
          * 
-         * @see com.itmill.toolkit.terminal.ErrorMessage#getErrorLevel()
+         * @see com.vaadin.terminal.ErrorMessage#getErrorLevel()
          */
         public int getErrorLevel() {
 
diff --git a/src/com/itmill/toolkit/data/BufferedValidatable.java b/src/com/vaadin/data/BufferedValidatable.java
index 24fd689122..0130c2b929 100644
--- a/src/com/itmill/toolkit/data/BufferedValidatable.java
+++ b/src/com/vaadin/data/BufferedValidatable.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 
diff --git a/src/com/itmill/toolkit/data/Container.java b/src/com/vaadin/data/Container.java
index 7b9bb31971..226a4e0b09 100644
--- a/src/com/itmill/toolkit/data/Container.java
+++ b/src/com/vaadin/data/Container.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -488,7 +488,7 @@ public interface Container extends Serializable {
          * <p>
          * The children must be first explicitly removed with
          * {@link #setParent(Object itemId, Object newParentId)}or
-         * {@link com.itmill.toolkit.data.Container#removeItem(Object itemId)}.
+         * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
          * </p>
          * 
          * <p>
@@ -554,17 +554,17 @@ public interface Container extends Serializable {
      * multiple filters are added, all filters must match for an item to be
      * visible in the container.
      * 
-     * When an {@link com.itmill.toolkit.data.Ordered} or
-     * {@link com.itmill.toolkit.data.Indexed} container is filtered, all
+     * When an {@link com.vaadin.data.Ordered} or
+     * {@link com.vaadin.data.Indexed} container is filtered, all
      * operations of these interfaces should only use the filtered contents and
      * the filtered indices to the container.
      * 
      * Adding items (if supported) to a filtered
-     * {@link com.itmill.toolkit.data.Ordered} or
-     * {@link com.itmill.toolkit.data.Indexed} container should insert them
+     * {@link com.vaadin.data.Ordered} or
+     * {@link com.vaadin.data.Indexed} container should insert them
      * immediately after the indicated visible item. The unfiltered position of
      * items added at index 0, at index
-     * {@link com.itmill.toolkit.data.Container#size()} or at an undefined
+     * {@link com.vaadin.data.Container#size()} or at an undefined
      * position is up to the implementation.
      * 
      * @since 5.0
diff --git a/src/com/itmill/toolkit/data/Item.java b/src/com/vaadin/data/Item.java
index 1259d9cbda..103a9cf177 100644
--- a/src/com/itmill/toolkit/data/Item.java
+++ b/src/com/vaadin/data/Item.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 import java.util.Collection;
diff --git a/src/com/itmill/toolkit/data/Property.java b/src/com/vaadin/data/Property.java
index b3277fdde2..ab69411885 100644
--- a/src/com/itmill/toolkit/data/Property.java
+++ b/src/com/vaadin/data/Property.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 
diff --git a/src/com/itmill/toolkit/data/Validatable.java b/src/com/vaadin/data/Validatable.java
index e5c074726b..aba6050f49 100644
--- a/src/com/itmill/toolkit/data/Validatable.java
+++ b/src/com/vaadin/data/Validatable.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -18,7 +18,7 @@ import java.util.Collection;
  * @version
  * @VERSION@
  * @since 3.0
- * @see com.itmill.toolkit.data.Validator
+ * @see com.vaadin.data.Validator
  */
 public interface Validatable extends Serializable {
 
diff --git a/src/com/itmill/toolkit/data/Validator.java b/src/com/vaadin/data/Validator.java
index 55626fb040..665fec4156 100644
--- a/src/com/itmill/toolkit/data/Validator.java
+++ b/src/com/vaadin/data/Validator.java
@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data;
+package com.vaadin.data;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * Object validator interface. Implementors of this class can be added to any
- * {@link com.itmill.toolkit.data.Validatable} object to verify its value. The
+ * {@link com.vaadin.data.Validatable} object to verify its value. The
  * <code>Validatable#isValid(Object)</code> iterates all registered
  * <code>Validator</code>s, calling their {@link #validate(Object)} methods.
  * <code>validate(Object)</code> should throw the
diff --git a/src/com/itmill/toolkit/data/doc-files/Container_full.gif b/src/com/vaadin/data/doc-files/Container_full.gif
index 28ee720e32..28ee720e32 100644
--- a/src/com/itmill/toolkit/data/doc-files/Container_full.gif
+++ b/src/com/vaadin/data/doc-files/Container_full.gif
diff --git a/src/com/itmill/toolkit/data/doc-files/Container_simple.gif b/src/com/vaadin/data/doc-files/Container_simple.gif
index 6db32581b8..6db32581b8 100644
--- a/src/com/itmill/toolkit/data/doc-files/Container_simple.gif
+++ b/src/com/vaadin/data/doc-files/Container_simple.gif
diff --git a/src/com/itmill/toolkit/data/doc-files/Item.gif b/src/com/vaadin/data/doc-files/Item.gif
index 4cd202ceba..4cd202ceba 100644
--- a/src/com/itmill/toolkit/data/doc-files/Item.gif
+++ b/src/com/vaadin/data/doc-files/Item.gif
diff --git a/src/com/itmill/toolkit/data/doc-files/Property.gif b/src/com/vaadin/data/doc-files/Property.gif
index 4aff19db1c..4aff19db1c 100644
--- a/src/com/itmill/toolkit/data/doc-files/Property.gif
+++ b/src/com/vaadin/data/doc-files/Property.gif
diff --git a/src/com/itmill/toolkit/data/doc-files/datalayer.gif b/src/com/vaadin/data/doc-files/datalayer.gif
index b3d25639e0..b3d25639e0 100644
--- a/src/com/itmill/toolkit/data/doc-files/datalayer.gif
+++ b/src/com/vaadin/data/doc-files/datalayer.gif
diff --git a/src/com/itmill/toolkit/data/package.html b/src/com/vaadin/data/package.html
index 2263ab459a..f6e0a2d645 100644
--- a/src/com/itmill/toolkit/data/package.html
+++ b/src/com/vaadin/data/package.html
@@ -7,12 +7,12 @@
 
 <p>Provides interfaces for the data layer which contains classes
 for typed data values, data collections, and handlers. A 
-{@link com.itmill.toolkit.data.Property Property} is a simple typed data
-value; an {@link com.itmill.toolkit.data.Item Item} is a collection of
+{@link com.vaadin.data.Property Property} is a simple typed data
+value; an {@link com.vaadin.data.Item Item} is a collection of
 Properties, each corresponding to a unique identifier; a
-{@link com.itmill.toolkit.data.Container Container} is a collection of
+{@link com.vaadin.data.Container Container} is a collection of
 identified Items with special constraints; a
-{@link com.itmill.toolkit.data.Buffered Buffered} class is able to track
+{@link com.vaadin.data.Buffered Buffered} class is able to track
 its changes and to commit or discard them later.</p>
 
 <h2>Package Specification</h2>
@@ -28,17 +28,17 @@ collections of them:</p>
 
 <ul>
 	<li>The simplest of these is the
-	{@link com.itmill.toolkit.data.Property Property} which represents a
+	{@link com.vaadin.data.Property Property} which represents a
 	single typed data value. A Property may be read-only in which
 	case attempts to modify its contents will throw an exception.	 
 
 	<li>The second level of the data layer is represented by the
-	{@link com.itmill.toolkit.data.Item Item} which embodies a set of
+	{@link com.vaadin.data.Item Item} which embodies a set of
 	<i>Properties</i>. Each Property in an Item corresponds to a locally
 	unique(that is, inside the Item) identifier.
 	
 	<li>The third level is called the
-	{@link com.itmill.toolkit.data.Container Container} which can be
+	{@link com.vaadin.data.Container Container} which can be
 	visualized as a set of Items, each corresponding to a locally unique
 	identifier. Note that the Container imposes a few restrictions on the
 	data stored in it, see further documentation in the
@@ -46,7 +46,7 @@ collections of them:</p>
 </ul>
 
 <p>In addition to these interfaces the package contains the 
-{@link com.itmill.toolkit.data.Buffered Buffered} interface, which defines
+{@link com.vaadin.data.Buffered Buffered} interface, which defines
 the methods to make an object buffered, that is, track the changes to an
 object and allow committing or discarding them at a later time.</p>
 
@@ -57,8 +57,8 @@ validation, and another one for the validators themselves.</p>
 <h2>Validation</h2>
 
 <p>The most important method defined by the
-{@link com.itmill.toolkit.data.Validatable Validatable} interface is
-{@link com.itmill.toolkit.data.Validatable#isValid() isValid()}. It
+{@link com.vaadin.data.Validatable Validatable} interface is
+{@link com.vaadin.data.Validatable#isValid() isValid()}. It
 asks all registered validators to verify if the object's value is valid
 or not. Note that it depends on the validators registered for a object which
 values are valid and which are not. For example, a <code>null</code> value
@@ -67,18 +67,18 @@ can be valid value for one validator but invalid for another.<p>
 <p>In addition to <code>isValid()</code>, <code>Validatable</code> defines
 methods to add, remove and list validators of a validatable object.</p>
 
-<p>{@link com.itmill.toolkit.data.Validator Validator} defines the
+<p>{@link com.vaadin.data.Validator Validator} defines the
 interface for an external validator.  These validators may be added to
 any <code>Validatable</code> object, and their task is to check, when
 requested, that the object which they are attached to contains a valid
 value. The actual validation logic is hidden in the 
-{@link com.itmill.toolkit.data.Validator#validate(Object) validate(Object)}
+{@link com.vaadin.data.Validator#validate(Object) validate(Object)}
 method.</p>
 
 <p>In addition to <code>check(Object)</code>, <code>Validator</code> defines
 the <code>InvalidValueException</code> which is used to signal that a
 checked value is invalid, and the
-{@link com.itmill.toolkit.data.Validator.Suggestive Suggestive}
+{@link com.vaadin.data.Validator.Suggestive Suggestive}
 subinterface which includes functionality to suggest a valid value for
 the validated object.</p><!-- Put @see and @since tags down here. -->
 
diff --git a/src/com/itmill/toolkit/data/util/BeanItem.java b/src/com/vaadin/data/util/BeanItem.java
index 0df0ea39e8..5e12bc3c1d 100644
--- a/src/com/itmill/toolkit/data/util/BeanItem.java
+++ b/src/com/vaadin/data/util/BeanItem.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.beans.BeanInfo;
 import java.beans.Introspector;
@@ -12,7 +12,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Property;
 
 /**
  * A wrapper class for adding the Item interface to any Java Bean.
diff --git a/src/com/itmill/toolkit/data/util/BeanItemContainer.java b/src/com/vaadin/data/util/BeanItemContainer.java
index a2df599df2..6a64e57f36 100644
--- a/src/com/itmill/toolkit/data/util/BeanItemContainer.java
+++ b/src/com/vaadin/data/util/BeanItemContainer.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.beans.PropertyDescriptor;
 import java.io.IOException;
@@ -15,15 +15,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Container.Filterable;
-import com.itmill.toolkit.data.Container.Indexed;
-import com.itmill.toolkit.data.Container.ItemSetChangeNotifier;
-import com.itmill.toolkit.data.Container.Sortable;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.Property.ValueChangeNotifier;
+import com.vaadin.data.Container;
+import com.vaadin.data.Property;
+import com.vaadin.data.Container.Filterable;
+import com.vaadin.data.Container.Indexed;
+import com.vaadin.data.Container.ItemSetChangeNotifier;
+import com.vaadin.data.Container.Sortable;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.data.Property.ValueChangeNotifier;
 
 /**
  * An {@link ArrayList} backed container for {@link BeanItem}s.
@@ -103,7 +103,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
     /**
      * Unsupported operation.
      * 
-     * @see com.itmill.toolkit.data.Container.Indexed#addItemAt(int)
+     * @see com.vaadin.data.Container.Indexed#addItemAt(int)
      */
     public Object addItemAt(int index) throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
@@ -114,7 +114,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
      * 
      * The bean is used both as the item contents and as the item identifier.
      * 
-     * @see com.itmill.toolkit.data.Container.Indexed#addItemAt(int, Object)
+     * @see com.vaadin.data.Container.Indexed#addItemAt(int, Object)
      */
     public BeanItem addItemAt(int index, Object newItemId)
             throws UnsupportedOperationException {
@@ -178,7 +178,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
     /**
      * Unsupported operation.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(Object)
+     * @see com.vaadin.data.Container.Ordered#addItemAfter(Object)
      */
     public Object addItemAfter(Object previousItemId)
             throws UnsupportedOperationException {
@@ -190,7 +190,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
      * 
      * The bean is used both as the item contents and as the item identifier.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(Object,
+     * @see com.vaadin.data.Container.Ordered#addItemAfter(Object,
      *      Object)
      */
     public BeanItem addItemAfter(Object previousItemId, Object newItemId)
@@ -257,7 +257,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
     /**
      * Unsupported operation.
      * 
-     * @see com.itmill.toolkit.data.Container#addItem()
+     * @see com.vaadin.data.Container#addItem()
      */
     public Object addItem() throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
@@ -268,7 +268,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
      * 
      * The bean is used both as the item contents and as the item identifier.
      * 
-     * @see com.itmill.toolkit.data.Container#addItem(Object)
+     * @see com.vaadin.data.Container#addItem(Object)
      */
     public BeanItem addBean(BT bean) {
         return addItem(bean);
@@ -279,7 +279,7 @@ public class BeanItemContainer<BT> implements Indexed, Sortable, Filterable,
      * 
      * The bean is used both as the item contents and as the item identifier.
      * 
-     * @see com.itmill.toolkit.data.Container#addItem(Object)
+     * @see com.vaadin.data.Container#addItem(Object)
      */
     public BeanItem addItem(Object itemId) throws UnsupportedOperationException {
         if (list.size() > 0) {
diff --git a/src/com/itmill/toolkit/data/util/ContainerHierarchicalWrapper.java b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 2c88c2ab61..4188591014 100644
--- a/src/com/itmill/toolkit/data/util/ContainerHierarchicalWrapper.java
+++ b/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -12,14 +12,14 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * <p>
  * A wrapper class for adding external hierarchy to containers not implementing
- * the {@link com.itmill.toolkit.data.Container.Hierarchical} interface.
+ * the {@link com.vaadin.data.Container.Hierarchical} interface.
  * </p>
  * 
  * <p>
@@ -275,7 +275,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * this method fails and <code>false</code> is returned; the children must
      * be first explicitly removed with
      * {@link #setParent(Object itemId, Object newParentId)} or
-     * {@link com.itmill.toolkit.data.Container#removeItem(Object itemId)}.
+     * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
      * </p>
      * 
      * @param itemId
diff --git a/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java b/src/com/vaadin/data/util/ContainerOrderedWrapper.java
index a57fbb1719..0d4600caab 100644
--- a/src/com/itmill/toolkit/data/util/ContainerOrderedWrapper.java
+++ b/src/com/vaadin/data/util/ContainerOrderedWrapper.java
@@ -2,21 +2,21 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.util.Collection;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * <p>
  * A wrapper class for adding external ordering to containers not implementing
- * the {@link com.itmill.toolkit.data.Container.Ordered} interface.
+ * the {@link com.vaadin.data.Container.Ordered} interface.
  * </p>
  * 
  * <p>
@@ -512,7 +512,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object,
+     * com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
      * java.lang.Object)
      */
     public Item addItemAfter(Object previousItemId, Object newItemId)
@@ -538,7 +538,7 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object)
+     * com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
     public Object addItemAfter(Object previousItemId)
             throws UnsupportedOperationException {
diff --git a/src/com/itmill/toolkit/data/util/FilesystemContainer.java b/src/com/vaadin/data/util/FilesystemContainer.java
index 03451ad411..3c8fcac92f 100644
--- a/src/com/itmill/toolkit/data/util/FilesystemContainer.java
+++ b/src/com/vaadin/data/util/FilesystemContainer.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -18,11 +18,11 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.service.FileTypeResolver;
-import com.itmill.toolkit.terminal.Resource;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.service.FileTypeResolver;
+import com.vaadin.terminal.Resource;
 
 /**
  * A hierarchical container wrapper for a filesystem.
@@ -713,7 +713,7 @@ public class FilesystemContainer implements Container.Hierarchical {
         /**
          * Filesystem container does not support adding new properties.
          * 
-         * @see com.itmill.toolkit.data.Item#addItemProperty(Object, Property)
+         * @see com.vaadin.data.Item#addItemProperty(Object, Property)
          */
         public boolean addItemProperty(Object id, Property property)
                 throws UnsupportedOperationException {
@@ -724,7 +724,7 @@ public class FilesystemContainer implements Container.Hierarchical {
         /**
          * Filesystem container does not support removing properties.
          * 
-         * @see com.itmill.toolkit.data.Item#removeItemProperty(Object)
+         * @see com.vaadin.data.Item#removeItemProperty(Object)
          */
         public boolean removeItemProperty(Object id)
                 throws UnsupportedOperationException {
@@ -829,7 +829,7 @@ public class FilesystemContainer implements Container.Hierarchical {
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container#addContainerProperty(java.lang.Object,
+     * com.vaadin.data.Container#addContainerProperty(java.lang.Object,
      * java.lang.Class, java.lang.Object)
      */
     public boolean addContainerProperty(Object propertyId, Class type,
@@ -841,7 +841,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#addItem()
+     * @see com.vaadin.data.Container#addItem()
      */
     public Object addItem() throws UnsupportedOperationException {
         throw new UnsupportedOperationException(
@@ -851,7 +851,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#addItem(java.lang.Object)
+     * @see com.vaadin.data.Container#addItem(java.lang.Object)
      */
     public Item addItem(Object itemId) throws UnsupportedOperationException {
         throw new UnsupportedOperationException(
@@ -861,7 +861,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#removeAllItems()
+     * @see com.vaadin.data.Container#removeAllItems()
      */
     public boolean removeAllItems() throws UnsupportedOperationException {
         throw new UnsupportedOperationException(
@@ -871,7 +871,7 @@ public class FilesystemContainer implements Container.Hierarchical {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#removeItem(java.lang.Object)
+     * @see com.vaadin.data.Container#removeItem(java.lang.Object)
      */
     public boolean removeItem(Object itemId)
             throws UnsupportedOperationException {
@@ -883,7 +883,7 @@ public class FilesystemContainer implements Container.Hierarchical {
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container#removeContainerProperty(java.lang.Object
+     * com.vaadin.data.Container#removeContainerProperty(java.lang.Object
      * )
      */
     public boolean removeContainerProperty(Object propertyId)
diff --git a/src/com/itmill/toolkit/data/util/Filter.java b/src/com/vaadin/data/util/Filter.java
index cd31a57b9d..d8d9172a28 100644
--- a/src/com/itmill/toolkit/data/util/Filter.java
+++ b/src/com/vaadin/data/util/Filter.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * A default filter that can be used to implement
- * {@link com.itmill.toolkit.data.Container.Filterable}.
+ * {@link com.vaadin.data.Container.Filterable}.
  * 
  * @since 5.4
  */
diff --git a/src/com/itmill/toolkit/data/util/HierarchicalContainer.java b/src/com/vaadin/data/util/HierarchicalContainer.java
index 75ade41e26..9ef4cdeb60 100644
--- a/src/com/itmill/toolkit/data/util/HierarchicalContainer.java
+++ b/src/com/vaadin/data/util/HierarchicalContainer.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -10,8 +10,8 @@ import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
 
 /**
  * A specialized Container whose contents can be accessed like it was a
@@ -110,7 +110,7 @@ public class HierarchicalContainer extends IndexedContainer implements
      * this method fails and <code>false</code> is returned; the children must
      * be first explicitly removed with
      * {@link #setParent(Object itemId, Object newParentId)} or
-     * {@link com.itmill.toolkit.data.Container#removeItem(Object itemId)}.
+     * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
      * </p>
      * 
      * @param itemId
@@ -236,7 +236,7 @@ public class HierarchicalContainer extends IndexedContainer implements
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.util.IndexedContainer#addItem()
+     * @see com.vaadin.data.util.IndexedContainer#addItem()
      */
     @Override
     public Object addItem() {
@@ -252,7 +252,7 @@ public class HierarchicalContainer extends IndexedContainer implements
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.util.IndexedContainer#addItem(java.lang.Object)
+     * com.vaadin.data.util.IndexedContainer#addItem(java.lang.Object)
      */
     @Override
     public Item addItem(Object itemId) {
@@ -266,7 +266,7 @@ public class HierarchicalContainer extends IndexedContainer implements
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.util.IndexedContainer#removeAllItems()
+     * @see com.vaadin.data.util.IndexedContainer#removeAllItems()
      */
     @Override
     public boolean removeAllItems() {
@@ -285,7 +285,7 @@ public class HierarchicalContainer extends IndexedContainer implements
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.util.IndexedContainer#removeItem(java.lang.Object
+     * com.vaadin.data.util.IndexedContainer#removeItem(java.lang.Object
      * )
      */
     @Override
diff --git a/src/com/itmill/toolkit/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java
index e649cace8e..4cad9e3995 100644
--- a/src/com/itmill/toolkit/data/util/IndexedContainer.java
+++ b/src/com/vaadin/data/util/IndexedContainer.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
@@ -20,9 +20,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * An implementation of the <code>{@link Container.Indexed}</code> interface
@@ -38,7 +38,7 @@ import com.itmill.toolkit.data.Property;
  * <li>Sends all needed events on content changes.
  * </ul>
  * 
- * @see com.itmill.toolkit.data.Container
+ * @see com.vaadin.data.Container
  * 
  * @author IT Mill Ltd.
  * @version
@@ -143,7 +143,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#getItem(java.lang.Object)
+     * @see com.vaadin.data.Container#getItem(java.lang.Object)
      */
     public Item getItem(Object itemId) {
 
@@ -158,7 +158,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#getItemIds()
+     * @see com.vaadin.data.Container#getItemIds()
      */
     public Collection getItemIds() {
         if (filteredItemIds != null) {
@@ -170,7 +170,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#getContainerPropertyIds()
+     * @see com.vaadin.data.Container#getContainerPropertyIds()
      */
     public Collection getContainerPropertyIds() {
         return Collections.unmodifiableCollection(propertyIds);
@@ -191,7 +191,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container#getContainerProperty(java.lang.Object,
+     * com.vaadin.data.Container#getContainerProperty(java.lang.Object,
      * java.lang.Object)
      */
     public Property getContainerProperty(Object itemId, Object propertyId) {
@@ -211,7 +211,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#size()
+     * @see com.vaadin.data.Container#size()
      */
     public int size() {
         if (filteredItemIds == null) {
@@ -223,7 +223,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#containsId(java.lang.Object)
+     * @see com.vaadin.data.Container#containsId(java.lang.Object)
      */
     public boolean containsId(Object itemId) {
         if (itemId == null) {
@@ -239,7 +239,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container#addContainerProperty(java.lang.Object,
+     * com.vaadin.data.Container#addContainerProperty(java.lang.Object,
      * java.lang.Class, java.lang.Object)
      */
     public boolean addContainerProperty(Object propertyId, Class type,
@@ -282,7 +282,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#removeAllItems()
+     * @see com.vaadin.data.Container#removeAllItems()
      */
     public boolean removeAllItems() {
 
@@ -302,7 +302,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#addItem()
+     * @see com.vaadin.data.Container#addItem()
      */
     public Object addItem() {
 
@@ -318,7 +318,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#addItem(java.lang.Object)
+     * @see com.vaadin.data.Container#addItem(java.lang.Object)
      */
     public Item addItem(Object itemId) {
 
@@ -366,7 +366,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container#removeItem(java.lang.Object)
+     * @see com.vaadin.data.Container#removeItem(java.lang.Object)
      */
     public boolean removeItem(Object itemId) {
 
@@ -387,7 +387,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container#removeContainerProperty(java.lang.Object
+     * com.vaadin.data.Container#removeContainerProperty(java.lang.Object
      * )
      */
     public boolean removeContainerProperty(Object propertyId) {
@@ -418,7 +418,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#firstItemId()
+     * @see com.vaadin.data.Container.Ordered#firstItemId()
      */
     public Object firstItemId() {
         try {
@@ -435,7 +435,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#lastItemId()
+     * @see com.vaadin.data.Container.Ordered#lastItemId()
      */
     public Object lastItemId() {
         try {
@@ -457,7 +457,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#nextItemId(java.lang.Object)
+     * com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object)
      */
     public Object nextItemId(Object itemId) {
         if (filteredItemIds != null) {
@@ -484,7 +484,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#prevItemId(java.lang.Object)
+     * com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object)
      */
     public Object prevItemId(Object itemId) {
         if (filteredItemIds != null) {
@@ -513,7 +513,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#isFirstId(java.lang.Object)
+     * com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object)
      */
     public boolean isFirstId(Object itemId) {
         if (filteredItemIds != null) {
@@ -530,7 +530,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#isLastId(java.lang.Object)
+     * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object)
      */
     public boolean isLastId(Object itemId) {
         if (filteredItemIds != null) {
@@ -552,7 +552,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object,
+     * com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
      * java.lang.Object)
      */
     public Item addItemAfter(Object previousItemId, Object newItemId) {
@@ -573,7 +573,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object)
+     * com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
     public Object addItemAfter(Object previousItemId) {
 
@@ -586,7 +586,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Indexed#getIdByIndex(int)
+     * @see com.vaadin.data.Container.Indexed#getIdByIndex(int)
      */
     public Object getIdByIndex(int index) {
 
@@ -612,7 +612,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Indexed#indexOfId(java.lang.Object)
+     * com.vaadin.data.Container.Indexed#indexOfId(java.lang.Object)
      */
     public int indexOfId(Object itemId) {
         if (filteredItemIds != null) {
@@ -636,7 +636,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Indexed#addItemAt(int,
+     * @see com.vaadin.data.Container.Indexed#addItemAt(int,
      * java.lang.Object)
      */
     public Item addItemAt(int index, Object newItemId) {
@@ -666,7 +666,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Indexed#addItemAt(int)
+     * @see com.vaadin.data.Container.Indexed#addItemAt(int)
      */
     public Object addItemAt(int index) {
 
@@ -738,7 +738,7 @@ public class IndexedContainer implements Container.Indexed,
          * (non-Javadoc)
          * 
          * @see
-         * com.itmill.toolkit.data.Container.PropertySetChangeEvent#getContainer
+         * com.vaadin.data.Container.PropertySetChangeEvent#getContainer
          * ()
          */
         public Container getContainer() {
@@ -769,7 +769,7 @@ public class IndexedContainer implements Container.Indexed,
          * (non-Javadoc)
          * 
          * @see
-         * com.itmill.toolkit.data.Container.ItemSetChangeEvent#getContainer()
+         * com.vaadin.data.Container.ItemSetChangeEvent#getContainer()
          */
         public Container getContainer() {
             return (Container) getSource();
@@ -806,7 +806,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property.ValueChangeEvent#getProperty()
+         * @see com.vaadin.data.Property.ValueChangeEvent#getProperty()
          */
         public Property getProperty() {
             return (Property) getSource();
@@ -818,8 +818,8 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.PropertySetChangeNotifier#addListener
-     * (com.itmill.toolkit.data.Container.PropertySetChangeListener)
+     * com.vaadin.data.Container.PropertySetChangeNotifier#addListener
+     * (com.vaadin.data.Container.PropertySetChangeListener)
      */
     public void addListener(Container.PropertySetChangeListener listener) {
         if (propertySetChangeListeners == null) {
@@ -832,8 +832,8 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.PropertySetChangeNotifier#removeListener
-     * (com.itmill.toolkit.data.Container.PropertySetChangeListener)
+     * com.vaadin.data.Container.PropertySetChangeNotifier#removeListener
+     * (com.vaadin.data.Container.PropertySetChangeListener)
      */
     public void removeListener(Container.PropertySetChangeListener listener) {
         if (propertySetChangeListeners != null) {
@@ -845,7 +845,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.ItemSetChangeNotifier#addListener(com
+     * com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com
      * .itmill.toolkit.data.Container.ItemSetChangeListener)
      */
     public void addListener(Container.ItemSetChangeListener listener) {
@@ -859,8 +859,8 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.ItemSetChangeNotifier#removeListener
-     * (com.itmill.toolkit.data.Container.ItemSetChangeListener)
+     * com.vaadin.data.Container.ItemSetChangeNotifier#removeListener
+     * (com.vaadin.data.Container.ItemSetChangeListener)
      */
     public void removeListener(Container.ItemSetChangeListener listener) {
         if (itemSetChangeListeners != null) {
@@ -872,7 +872,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Property.ValueChangeNotifier#addListener(com.
+     * com.vaadin.data.Property.ValueChangeNotifier#addListener(com.
      * itmill.toolkit.data.Property.ValueChangeListener)
      */
     public void addListener(Property.ValueChangeListener listener) {
@@ -886,7 +886,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Property.ValueChangeNotifier#removeListener(com
+     * com.vaadin.data.Property.ValueChangeNotifier#removeListener(com
      * .itmill.toolkit.data.Property.ValueChangeListener)
      */
     public void removeListener(Property.ValueChangeListener listener) {
@@ -1037,7 +1037,7 @@ public class IndexedContainer implements Container.Indexed,
     /* Internal Item and Property implementations */
 
     /*
-     * A class implementing the com.itmill.toolkit.data.Item interface to be
+     * A class implementing the com.vaadin.data.Item interface to be
      * contained in the list. @author IT Mill Ltd.
      * 
      * @version @VERSION@
@@ -1070,7 +1070,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Item#getItemProperty(java.lang.Object)
+         * @see com.vaadin.data.Item#getItemProperty(java.lang.Object)
          */
         public Property getItemProperty(Object id) {
             return new IndexedContainerProperty(itemId, id);
@@ -1144,7 +1144,7 @@ public class IndexedContainer implements Container.Indexed,
          * properties at container level. See
          * {@link IndexedContainer#addContainerProperty(Object, Class, Object)}
          * 
-         * @see com.itmill.toolkit.data.Item#addProperty(Object, Property)
+         * @see com.vaadin.data.Item#addProperty(Object, Property)
          */
         public boolean addItemProperty(Object id, Property property)
                 throws UnsupportedOperationException {
@@ -1157,7 +1157,7 @@ public class IndexedContainer implements Container.Indexed,
          * properties at container level. See
          * {@link IndexedContainer#removeContainerProperty(Object)}
          * 
-         * @see com.itmill.toolkit.data.Item#removeProperty(Object)
+         * @see com.vaadin.data.Item#removeProperty(Object)
          */
         public boolean removeItemProperty(Object id)
                 throws UnsupportedOperationException {
@@ -1215,7 +1215,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property#getType()
+         * @see com.vaadin.data.Property#getType()
          */
         public Class getType() {
             return (Class) types.get(propertyId);
@@ -1224,7 +1224,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property#getValue()
+         * @see com.vaadin.data.Property#getValue()
          */
         public Object getValue() {
             return ((Hashtable) items.get(itemId)).get(propertyId);
@@ -1233,7 +1233,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property#isReadOnly()
+         * @see com.vaadin.data.Property#isReadOnly()
          */
         public boolean isReadOnly() {
             return readOnlyProperties.contains(this);
@@ -1242,7 +1242,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property#setReadOnly(boolean)
+         * @see com.vaadin.data.Property#setReadOnly(boolean)
          */
         public void setReadOnly(boolean newStatus) {
             if (newStatus) {
@@ -1255,7 +1255,7 @@ public class IndexedContainer implements Container.Indexed,
         /*
          * (non-Javadoc)
          * 
-         * @see com.itmill.toolkit.data.Property#setValue(java.lang.Object)
+         * @see com.vaadin.data.Property#setValue(java.lang.Object)
          */
         public void setValue(Object newValue)
                 throws Property.ReadOnlyException, Property.ConversionException {
@@ -1349,8 +1349,8 @@ public class IndexedContainer implements Container.Indexed,
          * (non-Javadoc)
          * 
          * @see
-         * com.itmill.toolkit.data.Property.ValueChangeNotifier#addListener(
-         * com.itmill.toolkit.data.Property.ValueChangeListener)
+         * com.vaadin.data.Property.ValueChangeNotifier#addListener(
+         * com.vaadin.data.Property.ValueChangeListener)
          */
         public void addListener(Property.ValueChangeListener listener) {
             addSinglePropertyChangeListener(propertyId, itemId, listener);
@@ -1360,8 +1360,8 @@ public class IndexedContainer implements Container.Indexed,
          * (non-Javadoc)
          * 
          * @see
-         * com.itmill.toolkit.data.Property.ValueChangeNotifier#removeListener
-         * (com.itmill.toolkit.data.Property.ValueChangeListener)
+         * com.vaadin.data.Property.ValueChangeNotifier#removeListener
+         * (com.vaadin.data.Property.ValueChangeListener)
          */
         public void removeListener(Property.ValueChangeListener listener) {
             removeSinglePropertyChangeListener(propertyId, itemId, listener);
@@ -1376,7 +1376,7 @@ public class IndexedContainer implements Container.Indexed,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.data.Container.Sortable#sort(java.lang.Object[],
+     * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
      * boolean[])
      */
     public void sort(Object[] propertyId, boolean[] ascending) {
@@ -1420,7 +1420,7 @@ public class IndexedContainer implements Container.Indexed,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Sortable#getSortableContainerPropertyIds
+     * com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds
      * ()
      */
     public Collection getSortableContainerPropertyIds() {
diff --git a/src/com/itmill/toolkit/data/util/MethodProperty.java b/src/com/vaadin/data/util/MethodProperty.java
index e8f220be79..f74e84ea93 100644
--- a/src/com/itmill/toolkit/data/util/MethodProperty.java
+++ b/src/com/vaadin/data/util/MethodProperty.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -10,7 +10,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Property;
 
 /**
  * <p>
diff --git a/src/com/itmill/toolkit/data/util/ObjectProperty.java b/src/com/vaadin/data/util/ObjectProperty.java
index dd31c89606..6d58b2d92d 100644
--- a/src/com/itmill/toolkit/data/util/ObjectProperty.java
+++ b/src/com/vaadin/data/util/ObjectProperty.java
@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.lang.reflect.Constructor;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Property;
 
 /**
  * A simple data object containing one typed value. This class is a
  * straightforward implementation of the the
- * {@link com.itmill.toolkit.data.Property} interface.
+ * {@link com.vaadin.data.Property} interface.
  * 
  * @author IT Mill Ltd.
  * @version
diff --git a/src/com/itmill/toolkit/data/util/PropertyFormatter.java b/src/com/vaadin/data/util/PropertyFormatter.java
index 0b407bdd52..616c1beb0a 100644
--- a/src/com/itmill/toolkit/data/util/PropertyFormatter.java
+++ b/src/com/vaadin/data/util/PropertyFormatter.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Property;
 
 /**
  * Formatting proxy for a property.
@@ -363,7 +363,7 @@ public abstract class PropertyFormatter implements Property,
      * This should not be called directly.
      */
     public void valueChange(
-            com.itmill.toolkit.data.Property.ValueChangeEvent event) {
+            com.vaadin.data.Property.ValueChangeEvent event) {
         fireValueChange();
     }
 
@@ -373,7 +373,7 @@ public abstract class PropertyFormatter implements Property,
      * This should not be called directly.
      */
     public void readOnlyStatusChange(
-            com.itmill.toolkit.data.Property.ReadOnlyStatusChangeEvent event) {
+            com.vaadin.data.Property.ReadOnlyStatusChangeEvent event) {
         fireReadOnlyStatusChange();
     }
 
diff --git a/src/com/itmill/toolkit/data/util/PropertysetItem.java b/src/com/vaadin/data/util/PropertysetItem.java
index d2d2946d4e..83eb15b6ad 100644
--- a/src/com/itmill/toolkit/data/util/PropertysetItem.java
+++ b/src/com/vaadin/data/util/PropertysetItem.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -11,8 +11,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * Class for handling a set of identified Properties. The elements contained in
diff --git a/src/com/itmill/toolkit/data/util/QueryContainer.java b/src/com/vaadin/data/util/QueryContainer.java
index 2139318e0c..3716a7dce7 100644
--- a/src/com/itmill/toolkit/data/util/QueryContainer.java
+++ b/src/com/vaadin/data/util/QueryContainer.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.util;
+package com.vaadin.data.util;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -14,9 +14,9 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * <p>
@@ -36,10 +36,10 @@ import com.itmill.toolkit.data.Property;
  * <p>
  * Note : If data in the tables gets modified, Container will not get reflected
  * with the updates, we have to explicity invoke QueryContainer.refresh method.
- * {@link com.itmill.toolkit.data.util.QueryContainer#refresh() refresh()}
+ * {@link com.vaadin.data.util.QueryContainer#refresh() refresh()}
  * </p>
  * 
- * @see com.itmill.toolkit.data.Container
+ * @see com.vaadin.data.Container
  * 
  * @author IT Mill Ltd.
  * @version
diff --git a/src/com/itmill/toolkit/data/util/package.html b/src/com/vaadin/data/util/package.html
index 3148c89d4a..332d8f8143 100644
--- a/src/com/itmill/toolkit/data/util/package.html
+++ b/src/com/vaadin/data/util/package.html
@@ -9,21 +9,21 @@
 <p>Provides various utility classes that implement the data layer
 functionality.</p>
 
-<p>The first {@link com.itmill.toolkit.data.Property Property} class,
-{@link com.itmill.toolkit.data.util.ObjectProperty ObjectProperty}, provides
+<p>The first {@link com.vaadin.data.Property Property} class,
+{@link com.vaadin.data.util.ObjectProperty ObjectProperty}, provides
 a simple class containing a typed data value. The second,
-{@link com.itmill.toolkit.data.util.MethodProperty MethodProperty}, provides
+{@link com.vaadin.data.util.MethodProperty MethodProperty}, provides
 a way to bind a field of an object to the Property interface using the
 accessor methods for the field.</p>
 
 <p>The next level of the data layer, the
-{@link com.itmill.toolkit.data.Item Item}, is implemented by 
-{@link com.itmill.toolkit.data.util.BeanItem BeanItem}, though it is only a
+{@link com.vaadin.data.Item Item}, is implemented by 
+{@link com.vaadin.data.util.BeanItem BeanItem}, though it is only a
 simple wrapper to the former to provide the Item interface for any regular
 Java Bean.</p>
 
-<p>The third level, the {@link com.itmill.toolkit.data.Container Container},
-has several implementations in the {@link com.itmill.toolkit.data.util}
+<p>The third level, the {@link com.vaadin.data.Container Container},
+has several implementations in the {@link com.vaadin.data.util}
 package.</p>
 
 <!-- <h2>Package Specification</h2> -->
diff --git a/src/com/itmill/toolkit/data/validator/AbstractStringValidator.java b/src/com/vaadin/data/validator/AbstractStringValidator.java
index cecc63a637..7d08c69f29 100644
--- a/src/com/itmill/toolkit/data/validator/AbstractStringValidator.java
+++ b/src/com/vaadin/data/validator/AbstractStringValidator.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 /**
  * Validator base class for validating strings. See
- * {@link com.itmill.toolkit.data.validator.AbstractValidator} for more
+ * {@link com.vaadin.data.validator.AbstractValidator} for more
  * information.
  * 
  * <p>
diff --git a/src/com/itmill/toolkit/data/validator/AbstractValidator.java b/src/com/vaadin/data/validator/AbstractValidator.java
index c12ea0d848..5cfc8a57e8 100644
--- a/src/com/itmill/toolkit/data/validator/AbstractValidator.java
+++ b/src/com/vaadin/data/validator/AbstractValidator.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
-import com.itmill.toolkit.data.Validator;
+import com.vaadin.data.Validator;
 
 /**
  * Default Validator base class. See
- * {@link com.itmill.toolkit.data.validator.Validator} for more information.
+ * {@link com.vaadin.data.validator.Validator} for more information.
  * <p>
  * If the validation fails, the exception thrown contains the error message with
  * its argument 0 replaced with the toString() of the object being validated.
diff --git a/src/com/itmill/toolkit/data/validator/CompositeValidator.java b/src/com/vaadin/data/validator/CompositeValidator.java
index 13266d4ca8..99eb15b422 100644
--- a/src/com/itmill/toolkit/data/validator/CompositeValidator.java
+++ b/src/com/vaadin/data/validator/CompositeValidator.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.itmill.toolkit.data.Validator;
+import com.vaadin.data.Validator;
 
 /**
  * The <code>CompositeValidator</code> allows you to chain (compose) many
diff --git a/src/com/itmill/toolkit/data/validator/DoubleValidator.java b/src/com/vaadin/data/validator/DoubleValidator.java
index 9ee4fec65e..6027195bd4 100644
--- a/src/com/itmill/toolkit/data/validator/DoubleValidator.java
+++ b/src/com/vaadin/data/validator/DoubleValidator.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 /**
  * String validator for a double precision floating point number. See
- * {@link com.itmill.toolkit.data.validator.AbstractStringValidator} for more
+ * {@link com.vaadin.data.validator.AbstractStringValidator} for more
  * information.
  * 
  * @author IT Mill Ltd.
diff --git a/src/com/itmill/toolkit/data/validator/EmailValidator.java b/src/com/vaadin/data/validator/EmailValidator.java
index f833d5ca77..edb7c8ce80 100644
--- a/src/com/itmill/toolkit/data/validator/EmailValidator.java
+++ b/src/com/vaadin/data/validator/EmailValidator.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 /**
  * String validator for e-mail addresses. The e-mail address syntax is not
  * complete according to RFC 822 but handles the vast majority of valid e-mail
  * addresses correctly.
  * 
- * See {@link com.itmill.toolkit.data.validator.AbstractStringValidator} for
+ * See {@link com.vaadin.data.validator.AbstractStringValidator} for
  * more information.
  * 
  * @author IT Mill Ltd.
diff --git a/src/com/itmill/toolkit/data/validator/IntegerValidator.java b/src/com/vaadin/data/validator/IntegerValidator.java
index 48afacf8c8..53f73ded97 100644
--- a/src/com/itmill/toolkit/data/validator/IntegerValidator.java
+++ b/src/com/vaadin/data/validator/IntegerValidator.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 /**
  * String validator for integers. See
- * {@link com.itmill.toolkit.data.validator.AbstractStringValidator} for more
+ * {@link com.vaadin.data.validator.AbstractStringValidator} for more
  * information.
  * 
  * @author IT Mill Ltd.
diff --git a/src/com/itmill/toolkit/data/validator/NullValidator.java b/src/com/vaadin/data/validator/NullValidator.java
index be2b041bb2..b1af263ef7 100644
--- a/src/com/itmill/toolkit/data/validator/NullValidator.java
+++ b/src/com/vaadin/data/validator/NullValidator.java
@@ -2,9 +2,9 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
-import com.itmill.toolkit.data.Validator;
+import com.vaadin.data.Validator;
 
 /**
  * This validator is used for validating properties that do or do not allow null
diff --git a/src/com/itmill/toolkit/data/validator/RegexpValidator.java b/src/com/vaadin/data/validator/RegexpValidator.java
index eb42a2668a..2a3979dcdb 100644
--- a/src/com/itmill/toolkit/data/validator/RegexpValidator.java
+++ b/src/com/vaadin/data/validator/RegexpValidator.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -12,7 +12,7 @@ import java.util.regex.Pattern;
  * {@link java.util.regex.Pattern#sum}
  * </p>
  * <p>
- * See {@link com.itmill.toolkit.data.validator.AbstractStringValidator} for
+ * See {@link com.vaadin.data.validator.AbstractStringValidator} for
  * more information.
  * </p>
  * 
diff --git a/src/com/itmill/toolkit/data/validator/StringLengthValidator.java b/src/com/vaadin/data/validator/StringLengthValidator.java
index 6105b0e746..ff9a50e2cb 100644
--- a/src/com/itmill/toolkit/data/validator/StringLengthValidator.java
+++ b/src/com/vaadin/data/validator/StringLengthValidator.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.data.validator;
+package com.vaadin.data.validator;
 
 /**
  * This <code>StringLengthValidator</code> is used to validate the length of
diff --git a/src/com/itmill/toolkit/data/validator/package.html b/src/com/vaadin/data/validator/package.html
index 8697eb6313..8697eb6313 100644
--- a/src/com/itmill/toolkit/data/validator/package.html
+++ b/src/com/vaadin/data/validator/package.html
diff --git a/src/com/itmill/toolkit/demo/Calc.java b/src/com/vaadin/demo/Calc.java
index 8503f6e910..3691434375 100644
--- a/src/com/itmill/toolkit/demo/Calc.java
+++ b/src/com/vaadin/demo/Calc.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.demo;
+package com.vaadin.demo;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 // Calculator is created by extending Application-class. Application is
 // deployed by adding ApplicationServlet to web.xml and this class as
 // "application" parameter to the servlet.
-public class Calc extends com.itmill.toolkit.Application {
+public class Calc extends com.vaadin.Application {
 
     // Calculation data model is automatically stored in the user session
     private double current = 0.0;
diff --git a/src/com/itmill/toolkit/demo/HelloWorld.java b/src/com/vaadin/demo/HelloWorld.java
index 817d7ce647..36862545ea 100644
--- a/src/com/itmill/toolkit/demo/HelloWorld.java
+++ b/src/com/vaadin/demo/HelloWorld.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo;
+package com.vaadin.demo;
 
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
-public class HelloWorld extends com.itmill.toolkit.Application {
+public class HelloWorld extends com.vaadin.Application {
 
     /**
      * Init is invoked on application load (when a user accesses the application
diff --git a/src/com/itmill/toolkit/demo/PortletDemo.java b/src/com/vaadin/demo/PortletDemo.java
index e4089612f3..9e75e20a56 100644
--- a/src/com/itmill/toolkit/demo/PortletDemo.java
+++ b/src/com/vaadin/demo/PortletDemo.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.itmill.toolkit.demo;
+package com.vaadin.demo;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -15,15 +15,15 @@ import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.gwt.server.PortletApplicationContext;
-import com.itmill.toolkit.terminal.gwt.server.PortletApplicationContext.PortletListener;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.Application;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.gwt.server.PortletApplicationContext;
+import com.vaadin.terminal.gwt.server.PortletApplicationContext.PortletListener;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Window.Notification;
 
 /**
  * @author marc
diff --git a/src/com/itmill/toolkit/demo/SimpleAddressBook.java b/src/com/vaadin/demo/SimpleAddressBook.java
index f43c987036..d9a687feff 100644
--- a/src/com/itmill/toolkit/demo/SimpleAddressBook.java
+++ b/src/com/vaadin/demo/SimpleAddressBook.java
@@ -1,18 +1,18 @@
-package com.itmill.toolkit.demo;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.demo;
+
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class SimpleAddressBook extends Application {
 
diff --git a/src/com/itmill/toolkit/demo/ToolkitTunesLayout.java b/src/com/vaadin/demo/ToolkitTunesLayout.java
index 6d81263b39..4951eb2105 100644
--- a/src/com/itmill/toolkit/demo/ToolkitTunesLayout.java
+++ b/src/com/vaadin/demo/ToolkitTunesLayout.java
@@ -1,21 +1,21 @@
-package com.itmill.toolkit.demo;
+package com.vaadin.demo;
 
 import java.util.Random;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.Slider;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.Application;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.Slider;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Window.Notification;
 
 /**
  * Sample application layout, similar (almost identical) to Apple iTunes.
diff --git a/src/com/itmill/toolkit/demo/colorpicker/ColorPicker.java b/src/com/vaadin/demo/colorpicker/ColorPicker.java
index ad90a74abc..60f2807f1f 100644
--- a/src/com/itmill/toolkit/demo/colorpicker/ColorPicker.java
+++ b/src/com/vaadin/demo/colorpicker/ColorPicker.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.colorpicker;
+package com.vaadin.demo.colorpicker;
 
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.AbstractField;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.AbstractField;
 
 public class ColorPicker extends AbstractField {
 
diff --git a/src/com/itmill/toolkit/demo/colorpicker/ColorPickerApplication.java b/src/com/vaadin/demo/colorpicker/ColorPickerApplication.java
index a69a552516..a5df17607d 100644
--- a/src/com/itmill/toolkit/demo/colorpicker/ColorPickerApplication.java
+++ b/src/com/vaadin/demo/colorpicker/ColorPickerApplication.java
@@ -2,20 +2,20 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.colorpicker;
+package com.vaadin.demo.colorpicker;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Demonstration application that shows how to use a simple custom client-side
  * GWT component, the ColorPicker.
  */
-public class ColorPickerApplication extends com.itmill.toolkit.Application {
+public class ColorPickerApplication extends com.vaadin.Application {
     Window main = new Window("Color Picker Demo");
 
     /* The custom component. */
diff --git a/src/com/vaadin/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml b/src/com/vaadin/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml
new file mode 100644
index 0000000000..718ab9e2c6
--- /dev/null
+++ b/src/com/vaadin/demo/colorpicker/gwt/ColorPickerWidgetSet.gwt.xml
@@ -0,0 +1,11 @@
+<module>
+	<!-- Inherit DefaultWidgetSet -->
+	<inherits name="com.vaadin.terminal.gwt.DefaultWidgetSet" /> 
+	
+	<!-- WidgetSet default theme -->	
+	<stylesheet src="colorpicker/styles.css"/>
+
+	<!-- Entry point -->
+	<entry-point class="com.vaadin.demo.colorpicker.gwt.client.ColorPickerWidgetSet"/>
+  
+</module>
diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java b/src/com/vaadin/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java
index 51131534c9..0a73b6eb5a 100644
--- a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java
+++ b/src/com/vaadin/demo/colorpicker/gwt/client/ColorPickerWidgetSet.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.colorpicker.gwt.client;
+package com.vaadin.demo.colorpicker.gwt.client;
 
-import com.itmill.toolkit.demo.colorpicker.gwt.client.ui.IColorPicker;
-import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.demo.colorpicker.gwt.client.ui.IColorPicker;
+import com.vaadin.terminal.gwt.client.DefaultWidgetSet;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class ColorPickerWidgetSet extends DefaultWidgetSet {
     /** Resolves UIDL tag name to widget class. */
diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/GwtColorPicker.java b/src/com/vaadin/demo/colorpicker/gwt/client/ui/GwtColorPicker.java
index b4d060d528..c9bbedbd66 100644
--- a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/GwtColorPicker.java
+++ b/src/com/vaadin/demo/colorpicker/gwt/client/ui/GwtColorPicker.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.colorpicker.gwt.client.ui;
+package com.vaadin.demo.colorpicker.gwt.client.ui;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/IColorPicker.java b/src/com/vaadin/demo/colorpicker/gwt/client/ui/IColorPicker.java
index 8e893fb117..f238e9dc3f 100644
--- a/src/com/itmill/toolkit/demo/colorpicker/gwt/client/ui/IColorPicker.java
+++ b/src/com/vaadin/demo/colorpicker/gwt/client/ui/IColorPicker.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.colorpicker.gwt.client.ui;
+package com.vaadin.demo.colorpicker.gwt.client.ui;
 
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IColorPicker extends GwtColorPicker implements Paintable {
 
diff --git a/src/com/itmill/toolkit/demo/colorpicker/gwt/public/colorpicker/styles.css b/src/com/vaadin/demo/colorpicker/gwt/public/colorpicker/styles.css
index 4c3455ae53..4c3455ae53 100644
--- a/src/com/itmill/toolkit/demo/colorpicker/gwt/public/colorpicker/styles.css
+++ b/src/com/vaadin/demo/colorpicker/gwt/public/colorpicker/styles.css
diff --git a/src/com/itmill/toolkit/demo/coverflow/Coverflow.java b/src/com/vaadin/demo/coverflow/Coverflow.java
index a12aa7021c..5c8e9403c2 100644
--- a/src/com/itmill/toolkit/demo/coverflow/Coverflow.java
+++ b/src/com/vaadin/demo/coverflow/Coverflow.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.coverflow;
+package com.vaadin.demo.coverflow;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.AbstractSelect;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.AbstractSelect;
 
 public class Coverflow extends AbstractSelect {
 
diff --git a/src/com/itmill/toolkit/demo/coverflow/CoverflowApplication.html b/src/com/vaadin/demo/coverflow/CoverflowApplication.html
index 59f87c2123..1149357aa5 100644
--- a/src/com/itmill/toolkit/demo/coverflow/CoverflowApplication.html
+++ b/src/com/vaadin/demo/coverflow/CoverflowApplication.html
@@ -18,7 +18,7 @@
   <!-- start source code -->
    <td nowrap="nowrap" valign="top" align="left">
     <code>
-<font color="#7f0055"><b>package&nbsp;</b></font><font color="#000000">com.itmill.toolkit.demo.coverflow;</font><br />
+<font color="#7f0055"><b>package&nbsp;</b></font><font color="#000000">com.vaadin.demo.coverflow;</font><br />
 <font color="#ffffff"></font><br />
 <font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">java.io.BufferedReader;</font><br />
 <font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">java.io.FileInputStream;</font><br />
@@ -31,19 +31,19 @@
 <font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">java.net.URL;</font><br />
 <font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">java.nio.CharBuffer;</font><br />
 <font color="#ffffff"></font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.data.Property;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.terminal.Resource;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.terminal.Sizeable;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.terminal.ThemeResource;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Button;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Embedded;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.ExpandLayout;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Label;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Window;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Button.ClickEvent;</font><br />
-<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.itmill.toolkit.ui.Layout.AlignmentHandler;</font><br />
-<font color="#ffffff"></font><br />
-<font color="#7f0055"><b>public&nbsp;class&nbsp;</b></font><font color="#000000">CoverflowApplication&nbsp;</font><font color="#7f0055"><b>extends&nbsp;</b></font><font color="#000000">com.itmill.toolkit.Application&nbsp;</font><font color="#000000">{</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.data.Property;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.terminal.Resource;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.terminal.Sizeable;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.terminal.ThemeResource;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Button;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Embedded;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.ExpandLayout;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Label;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Window;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Button.ClickEvent;</font><br />
+<font color="#7f0055"><b>import&nbsp;</b></font><font color="#000000">com.vaadin.ui.Layout.AlignmentHandler;</font><br />
+<font color="#ffffff"></font><br />
+<font color="#7f0055"><b>public&nbsp;class&nbsp;</b></font><font color="#000000">CoverflowApplication&nbsp;</font><font color="#7f0055"><b>extends&nbsp;</b></font><font color="#000000">com.vaadin.Application&nbsp;</font><font color="#000000">{</font><br />
 <font color="#ffffff"></font><br />
 <font color="#ffffff">&nbsp;&nbsp;</font><font color="#000000">Coverflow&nbsp;covers&nbsp;=&nbsp;</font><font color="#7f0055"><b>new&nbsp;</b></font><font color="#000000">Coverflow</font><font color="#000000">()</font><font color="#000000">;</font><br />
 <font color="#ffffff"></font><br />
diff --git a/src/com/itmill/toolkit/demo/coverflow/CoverflowApplication.java b/src/com/vaadin/demo/coverflow/CoverflowApplication.java
index 941c808b09..25b5ddaa64 100644
--- a/src/com/itmill/toolkit/demo/coverflow/CoverflowApplication.java
+++ b/src/com/vaadin/demo/coverflow/CoverflowApplication.java
@@ -2,26 +2,26 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.coverflow;
+package com.vaadin.demo.coverflow;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-
-public class CoverflowApplication extends com.itmill.toolkit.Application {
+import com.vaadin.data.Property;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+
+public class CoverflowApplication extends com.vaadin.Application {
 
     Coverflow covers = new Coverflow();
 
diff --git a/src/com/vaadin/demo/coverflow/gwt/CoverflowWidgetSet.gwt.xml b/src/com/vaadin/demo/coverflow/gwt/CoverflowWidgetSet.gwt.xml
new file mode 100644
index 0000000000..36c016f131
--- /dev/null
+++ b/src/com/vaadin/demo/coverflow/gwt/CoverflowWidgetSet.gwt.xml
@@ -0,0 +1,8 @@
+<module>
+	<!-- Inherit the NoEntry version to avoid multiple entrypoints -->
+	<inherits name="com.vaadin.terminal.gwt.DefaultWidgetSetNoEntry" /> 
+
+	<!-- Entry point -->
+	<entry-point class="com.vaadin.demo.coverflow.gwt.client.CoverflowWidgetSet"/>
+  
+</module>
diff --git a/src/com/itmill/toolkit/demo/coverflow/gwt/client/CoverflowWidgetSet.java b/src/com/vaadin/demo/coverflow/gwt/client/CoverflowWidgetSet.java
index efa301413c..38037a4ba0 100644
--- a/src/com/itmill/toolkit/demo/coverflow/gwt/client/CoverflowWidgetSet.java
+++ b/src/com/vaadin/demo/coverflow/gwt/client/CoverflowWidgetSet.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.coverflow.gwt.client;
+package com.vaadin.demo.coverflow.gwt.client;
 
-import com.itmill.toolkit.demo.coverflow.gwt.client.ui.ICoverflow;
-import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.demo.coverflow.gwt.client.ui.ICoverflow;
+import com.vaadin.terminal.gwt.client.DefaultWidgetSet;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class CoverflowWidgetSet extends DefaultWidgetSet {
     /** Creates a widget according to its class name. */
diff --git a/src/com/itmill/toolkit/demo/coverflow/gwt/client/ui/ICoverflow.java b/src/com/vaadin/demo/coverflow/gwt/client/ui/ICoverflow.java
index 4a452f2ba2..c09d18c7d8 100644
--- a/src/com/itmill/toolkit/demo/coverflow/gwt/client/ui/ICoverflow.java
+++ b/src/com/vaadin/demo/coverflow/gwt/client/ui/ICoverflow.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
  
-package com.itmill.toolkit.demo.coverflow.gwt.client.ui;
+package com.vaadin.demo.coverflow.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,9 +11,9 @@ import java.util.Iterator;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTML;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class ICoverflow extends Composite implements Paintable {
     private String uidlId;
@@ -209,11 +209,11 @@ public class ICoverflow extends Composite implements Paintable {
           	var coverflow = $wnd.itmill.coverflow;
           	
           coverflow['getCovers_' + id] = function() {                
-             	app.@com.itmill.toolkit.demo.coverflow.gwt.client.ui.ICoverflow::getCovers()();
+             	app.@com.vaadin.demo.coverflow.gwt.client.ui.ICoverflow::getCovers()();
           };   
           
          	coverflow['setCurrent_' + id] = function(selected) {
-             	app.@com.itmill.toolkit.demo.coverflow.gwt.client.ui.ICoverflow::setCover(Ljava/lang/String;)(selected);
+             	app.@com.vaadin.demo.coverflow.gwt.client.ui.ICoverflow::setCover(Ljava/lang/String;)(selected);
           };
           
           $wnd.itmill.coverflow = coverflow;
diff --git a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/Cover.as b/src/com/vaadin/demo/coverflow/gwt/flex/Cover.as
index 61b08ead48..61b08ead48 100644
--- a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/Cover.as
+++ b/src/com/vaadin/demo/coverflow/gwt/flex/Cover.as
diff --git a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/Coverflow.as b/src/com/vaadin/demo/coverflow/gwt/flex/Coverflow.as
index 38d924b7dd..38d924b7dd 100644
--- a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/Coverflow.as
+++ b/src/com/vaadin/demo/coverflow/gwt/flex/Coverflow.as
diff --git a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/EventHandler.as b/src/com/vaadin/demo/coverflow/gwt/flex/EventHandler.as
index f9d25be24d..f9d25be24d 100644
--- a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/EventHandler.as
+++ b/src/com/vaadin/demo/coverflow/gwt/flex/EventHandler.as
diff --git a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/coverflowflash.mxml b/src/com/vaadin/demo/coverflow/gwt/flex/coverflowflash.mxml
index 612e8ba52f..612e8ba52f 100644
--- a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/coverflowflash.mxml
+++ b/src/com/vaadin/demo/coverflow/gwt/flex/coverflowflash.mxml
diff --git a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/sandy/util/DistortImage.as b/src/com/vaadin/demo/coverflow/gwt/flex/sandy/util/DistortImage.as
index 101e9e217c..101e9e217c 100644
--- a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/sandy/util/DistortImage.as
+++ b/src/com/vaadin/demo/coverflow/gwt/flex/sandy/util/DistortImage.as
diff --git a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/sandy/util/SandyPoint.as b/src/com/vaadin/demo/coverflow/gwt/flex/sandy/util/SandyPoint.as
index 7d5c52ca0c..7d5c52ca0c 100644
--- a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/sandy/util/SandyPoint.as
+++ b/src/com/vaadin/demo/coverflow/gwt/flex/sandy/util/SandyPoint.as
diff --git a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/sandy/util/Triangle.as b/src/com/vaadin/demo/coverflow/gwt/flex/sandy/util/Triangle.as
index 8f08fb6c76..8f08fb6c76 100644
--- a/src/com/itmill/toolkit/demo/coverflow/gwt/flex/sandy/util/Triangle.as
+++ b/src/com/vaadin/demo/coverflow/gwt/flex/sandy/util/Triangle.as
diff --git a/src/com/itmill/toolkit/demo/coverflow/gwt/public/coverflowflash.swf b/src/com/vaadin/demo/coverflow/gwt/public/coverflowflash.swf
index f3c75f4fe3..f3c75f4fe3 100644
--- a/src/com/itmill/toolkit/demo/coverflow/gwt/public/coverflowflash.swf
+++ b/src/com/vaadin/demo/coverflow/gwt/public/coverflowflash.swf
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/AccordionExample.java b/src/com/vaadin/demo/featurebrowser/AccordionExample.java
index 4d35a85bb5..8894f011e3 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/AccordionExample.java
+++ b/src/com/vaadin/demo/featurebrowser/AccordionExample.java
@@ -1,18 +1,16 @@
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * Accordion is a derivative of TabSheet, a vertical tabbed layout that places
  * the tab contents between the vertical tabs.
  */
-@SuppressWarnings("serial")
 public class AccordionExample extends CustomComponent {
-
     public AccordionExample() {
         // Create a new accordion
         final Accordion accordion = new Accordion();
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ButtonExample.java b/src/com/vaadin/demo/featurebrowser/ButtonExample.java
index 70f6ddfc9d..66a22ad657 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/ButtonExample.java
+++ b/src/com/vaadin/demo/featurebrowser/ButtonExample.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
-
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.demo.featurebrowser;
+
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Shows a few variations of Buttons and Links.
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/ClientCachingExample.java b/src/com/vaadin/demo/featurebrowser/ClientCachingExample.java
index af4b6e8827..4f8cad2448 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/ClientCachingExample.java
+++ b/src/com/vaadin/demo/featurebrowser/ClientCachingExample.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * This example is a (simple) demonstration of client-side caching. The content
@@ -21,7 +21,6 @@ import com.itmill.toolkit.ui.VerticalLayout;
  * 
  * @author IT Mill Ltd.
  */
-@SuppressWarnings("serial")
 public class ClientCachingExample extends CustomComponent {
 
     private static final String msg = "This example is a (simple) demonstration of client-side caching."
@@ -53,7 +52,6 @@ public class ClientCachingExample extends CustomComponent {
         layout = new VerticalLayout();
         layout.setMargin(true);
         l = new Label("Slow label - until cached client side.") {
-
             @Override
             public void paintContent(PaintTarget target) throws PaintException {
                 try {
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ComboBoxExample.java b/src/com/vaadin/demo/featurebrowser/ComboBoxExample.java
index ee0817c8f8..a28d16e597 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/ComboBoxExample.java
+++ b/src/com/vaadin/demo/featurebrowser/ComboBoxExample.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
 import java.util.Random;
 
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.AbstractSelect.Filtering;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.AbstractSelect.Filtering;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/EmbeddedBrowserExample.java b/src/com/vaadin/demo/featurebrowser/EmbeddedBrowserExample.java
index d5d54fa798..64800199c7 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/EmbeddedBrowserExample.java
+++ b/src/com/vaadin/demo/featurebrowser/EmbeddedBrowserExample.java
@@ -2,26 +2,25 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window.Notification;
 
 /**
  * Demonstrates the use of Embedded and "suggesting" Select by creating a simple
  * web-browser. Note: does not check for recursion.
  * 
  * @author IT Mill Ltd.
- * @see com.itmill.toolkit.ui.Window
+ * @see com.vaadin.ui.Window
  */
-@SuppressWarnings("serial")
 public class EmbeddedBrowserExample extends VerticalLayout implements
         Select.ValueChangeListener {
 
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java b/src/com/vaadin/demo/featurebrowser/FeatureBrowser.java
index b717cc17ca..5a583f3724 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/FeatureBrowser.java
+++ b/src/com/vaadin/demo/featurebrowser/FeatureBrowser.java
@@ -2,41 +2,41 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.util.HierarchicalContainer;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * 
  * @author IT Mill Ltd.
- * @see com.itmill.toolkit.ui.Window
+ * @see com.vaadin.ui.Window
  */
-public class FeatureBrowser extends com.itmill.toolkit.Application implements
+public class FeatureBrowser extends com.vaadin.Application implements
         Select.ValueChangeListener {
 
     // Property IDs
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java b/src/com/vaadin/demo/featurebrowser/FormExample.java
index 4315332dfd..182e6346d1 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java
+++ b/src/com/vaadin/demo/featurebrowser/FormExample.java
@@ -1,20 +1,20 @@
-package com.itmill.toolkit.demo.featurebrowser;
-
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.Validator.InvalidValueException;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.demo.featurebrowser;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.Validator;
+import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 /**
  * This example demonstrates the most important features of the Form component:
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/GeneratedColumnExample.java b/src/com/vaadin/demo/featurebrowser/GeneratedColumnExample.java
index d76e3b2330..e6a1edf088 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/GeneratedColumnExample.java
+++ b/src/com/vaadin/demo/featurebrowser/GeneratedColumnExample.java
@@ -2,29 +2,29 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
 import java.util.Collection;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Vector;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Container.Indexed;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.AbstractField;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Container.Indexed;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.AbstractField;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 /**
  * This example demonstrates the use of generated columns in a table. Generated
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/JavaScriptAPIExample.java b/src/com/vaadin/demo/featurebrowser/JavaScriptAPIExample.java
index 902eef0446..4656263163 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/JavaScriptAPIExample.java
+++ b/src/com/vaadin/demo/featurebrowser/JavaScriptAPIExample.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
 import java.util.Date;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * An example using a RichTextArea to edit a Label in XHTML-mode.
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/LabelExample.java b/src/com/vaadin/demo/featurebrowser/LabelExample.java
index dea74e9345..1d197455c8 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/LabelExample.java
+++ b/src/com/vaadin/demo/featurebrowser/LabelExample.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
 
 /**
  * Shows a few variations of Labels, including the effects of XHTML- and
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java b/src/com/vaadin/demo/featurebrowser/LayoutExample.java
index 337a647ca5..d6f8e82070 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/LayoutExample.java
+++ b/src/com/vaadin/demo/featurebrowser/LayoutExample.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * A few examples of layout possibilities.
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/NotificationExample.java b/src/com/vaadin/demo/featurebrowser/NotificationExample.java
index 101f3714c7..4c796d7b48 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/NotificationExample.java
+++ b/src/com/vaadin/demo/featurebrowser/NotificationExample.java
@@ -2,26 +2,26 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.data.Item;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 /**
  * Demonstrates the use of Notifications.
  * 
  * @author IT Mill Ltd.
- * @see com.itmill.toolkit.ui.Window
+ * @see com.vaadin.ui.Window
  */
 public class NotificationExample extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/RichTextExample.java b/src/com/vaadin/demo/featurebrowser/RichTextExample.java
index e5c08f00fa..475f128e7a 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/RichTextExample.java
+++ b/src/com/vaadin/demo/featurebrowser/RichTextExample.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
-
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.demo.featurebrowser;
+
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * An example using a RichTextArea to edit a Label in XHTML-mode.
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/SelectExample.java b/src/com/vaadin/demo/featurebrowser/SelectExample.java
index 50244e2c0e..44a5343784 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/SelectExample.java
+++ b/src/com/vaadin/demo/featurebrowser/SelectExample.java
@@ -2,20 +2,20 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.ListSelect;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TwinColSelect;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TwinColSelect;
+import com.vaadin.ui.VerticalLayout;
 
 /**
  * Shows some basic fields for value input; TextField, DateField, Slider...
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/TableExample.java b/src/com/vaadin/demo/featurebrowser/TableExample.java
index 7646879e3f..f1dfc1f187 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/TableExample.java
+++ b/src/com/vaadin/demo/featurebrowser/TableExample.java
@@ -2,23 +2,23 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
 import java.util.Iterator;
 import java.util.Random;
 import java.util.Set;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.event.Action;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Table example.
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/TreeExample.java b/src/com/vaadin/demo/featurebrowser/TreeExample.java
index c2f6e2e930..c4d7a54a38 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/TreeExample.java
+++ b/src/com/vaadin/demo/featurebrowser/TreeExample.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
-
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
+package com.vaadin.demo.featurebrowser;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.event.Action;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
 
 /**
  * Demonstrates basic Tree -functionality. Actions are used for add/remove item
@@ -39,7 +39,6 @@ public class TreeExample extends CustomComponent implements Action.Handler,
     public TreeExample() {
         final HorizontalLayout main = new HorizontalLayout();
         main.setWidth("100%");
-        main.setDebugId("mainLayout");
         main.setMargin(true);
         setCompositionRoot(main);
 
@@ -51,7 +50,6 @@ public class TreeExample extends CustomComponent implements Action.Handler,
         p.addComponent(new Label(desc));
         // Tree with a few items
         tree = new Tree();
-        tree.setDebugId("tree");
         tree.setImmediate(true);
         // we'll use a property for caption instead of the item id ("value"),
         // so that multiple items can have the same caption
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java b/src/com/vaadin/demo/featurebrowser/ValueInputExample.java
index eb6b880fbb..455acc3625 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/ValueInputExample.java
+++ b/src/com/vaadin/demo/featurebrowser/ValueInputExample.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.InlineDateField;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Slider;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.InlineDateField;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Slider;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window.Notification;
 
 /**
  * Shows some basic fields for value input; TextField, DateField, Slider...
diff --git a/src/com/itmill/toolkit/automatedtests/featurebrowser/WindowingExample.java b/src/com/vaadin/demo/featurebrowser/WindowingExample.java
index 6c46853dca..23c579d19b 100644
--- a/src/com/itmill/toolkit/automatedtests/featurebrowser/WindowingExample.java
+++ b/src/com/vaadin/demo/featurebrowser/WindowingExample.java
@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.automatedtests.featurebrowser;
+package com.vaadin.demo.featurebrowser;
 
 import java.net.URL;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * @author marc
diff --git a/src/com/itmill/toolkit/demo/package.html b/src/com/vaadin/demo/package.html
index d9bb6824f7..d9bb6824f7 100644
--- a/src/com/itmill/toolkit/demo/package.html
+++ b/src/com/vaadin/demo/package.html
diff --git a/src/com/itmill/toolkit/demo/reservation/CalendarDemo.java b/src/com/vaadin/demo/reservation/CalendarDemo.java
index 664fc6d5d9..5c4571fda6 100644
--- a/src/com/itmill/toolkit/demo/reservation/CalendarDemo.java
+++ b/src/com/vaadin/demo/reservation/CalendarDemo.java
@@ -2,31 +2,31 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.reservation;
+package com.vaadin.demo.reservation;
 
 import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.Date;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.util.QueryContainer;
-import com.itmill.toolkit.demo.util.SampleCalendarDatabase;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.data.util.QueryContainer;
+import com.vaadin.demo.util.SampleCalendarDatabase;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
 
 /**
  * This example shows how the CalendarField can use Containers. A QueryContainer
  * is used to bind SQL table rows to the calendar. Demonstrates: how to create
- * <code>com.itmill.toolkit.data.Container</code> and set it as datasource for
- * <code>com.itmill.toolkit.ui.Component.CalendarField</code>
+ * <code>com.vaadin.data.Container</code> and set it as datasource for
+ * <code>com.vaadin.ui.Component.CalendarField</code>
  * 
  * @author IT Mill Ltd.
  * @since 4.0.0
  * 
  */
-public class CalendarDemo extends com.itmill.toolkit.Application {
+public class CalendarDemo extends com.vaadin.Application {
 
     // Database provided with sample data
     private SampleCalendarDatabase sampleDatabase;
diff --git a/src/com/itmill/toolkit/demo/reservation/CalendarField.java b/src/com/vaadin/demo/reservation/CalendarField.java
index 03da8221c6..429f04ecbe 100644
--- a/src/com/itmill/toolkit/demo/reservation/CalendarField.java
+++ b/src/com/vaadin/demo/reservation/CalendarField.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.reservation;
+package com.vaadin.demo.reservation;
 
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.DateField;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.DateField;
 
 // TODO send one month at a time, do lazyLoading
 // TODO check date limit when updating variables
@@ -79,7 +79,7 @@ public class CalendarField extends DateField implements Container.Viewer {
      * 
      * @param resolution
      *            the resolution to set.
-     * @see com.itmill.toolkit.ui.DateField#setResolution(int)
+     * @see com.vaadin.ui.DateField#setResolution(int)
      */
     @Override
     public void setResolution(int resolution) {
diff --git a/src/com/itmill/toolkit/demo/reservation/GoogleMap.java b/src/com/vaadin/demo/reservation/GoogleMap.java
index 2dac57be63..9854227bc1 100644
--- a/src/com/itmill/toolkit/demo/reservation/GoogleMap.java
+++ b/src/com/vaadin/demo/reservation/GoogleMap.java
@@ -2,20 +2,20 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.reservation;
+package com.vaadin.demo.reservation;
 
 import java.awt.geom.Point2D;
 import java.util.Collection;
 import java.util.Iterator;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.ui.AbstractComponent;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.ui.AbstractComponent;
 
 public class GoogleMap extends AbstractComponent implements Sizeable,
         Container.Viewer {
diff --git a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java b/src/com/vaadin/demo/reservation/ReservationApplication.java
index 1d68a45452..baba6c11a2 100644
--- a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
+++ b/src/com/vaadin/demo/reservation/ReservationApplication.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.reservation;
+package com.vaadin.demo.reservation;
 
 import java.awt.geom.Point2D;
 import java.util.Calendar;
@@ -11,22 +11,22 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.Application;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
+import com.vaadin.ui.Window.Notification;
 
 public class ReservationApplication extends Application {
 
diff --git a/src/com/itmill/toolkit/demo/reservation/ResourceNotAvailableException.java b/src/com/vaadin/demo/reservation/ResourceNotAvailableException.java
index 4ae388d0e4..61e47b9153 100644
--- a/src/com/itmill/toolkit/demo/reservation/ResourceNotAvailableException.java
+++ b/src/com/vaadin/demo/reservation/ResourceNotAvailableException.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.reservation;
+package com.vaadin.demo.reservation;
 
 public class ResourceNotAvailableException extends Exception {
     public ResourceNotAvailableException(String message) {
diff --git a/src/com/itmill/toolkit/demo/reservation/ResourceSelectorPanel.java b/src/com/vaadin/demo/reservation/ResourceSelectorPanel.java
index 64974bf2ea..d52f1ac84a 100644
--- a/src/com/itmill/toolkit/demo/reservation/ResourceSelectorPanel.java
+++ b/src/com/vaadin/demo/reservation/ResourceSelectorPanel.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.reservation;
+package com.vaadin.demo.reservation;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class ResourceSelectorPanel extends Panel implements
         Button.ClickListener {
diff --git a/src/com/itmill/toolkit/demo/reservation/SampleDB.java b/src/com/vaadin/demo/reservation/SampleDB.java
index b865d69a1e..225d4c767b 100644
--- a/src/com/itmill/toolkit/demo/reservation/SampleDB.java
+++ b/src/com/vaadin/demo/reservation/SampleDB.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.reservation;
+package com.vaadin.demo.reservation;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -16,9 +16,9 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.QueryContainer;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.QueryContainer;
 
 public class SampleDB {
     public class User {
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/ReservationWidgetSet.gwt.xml b/src/com/vaadin/demo/reservation/gwt/ReservationWidgetSet.gwt.xml
index a15cd4185f..8de74a3b9b 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/ReservationWidgetSet.gwt.xml
+++ b/src/com/vaadin/demo/reservation/gwt/ReservationWidgetSet.gwt.xml
@@ -1,6 +1,6 @@
 <module>
 	<!-- Inherit DefaultWidgetSet -->
-	<inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSet" /> 
+	<inherits name="com.vaadin.terminal.gwt.DefaultWidgetSet" /> 
 	
 	<!-- The googlemaps_gwt module -->
 	<inherits name="com.google.gwt.maps.GoogleMaps" />
@@ -24,6 +24,6 @@
 	<script src="http://maps.google.com/maps?gwt=1&amp;file=api&amp;v=2.x&amp;key=ABQIAAAA4q5gw_y_N1Anvvn1KqbLwRTHuC2ERVOT66iQW8-FqpCQQUlHqBTZ0rGKdlKh9fxQOKN87TCwVNlIXQ" />
 
 	<!-- Entry point -->
-	<entry-point class="com.itmill.toolkit.demo.reservation.gwt.client.ReservationWidgetSet"/>
+	<entry-point class="com.vaadin.demo.reservation.gwt.client.ReservationWidgetSet"/>
   
 </module>
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java b/src/com/vaadin/demo/reservation/gwt/client/ReservationWidgetSet.java
index 71582ba0c5..9bf5f22061 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ReservationWidgetSet.java
+++ b/src/com/vaadin/demo/reservation/gwt/client/ReservationWidgetSet.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.reservation.gwt.client;
+package com.vaadin.demo.reservation.gwt.client;
 
-import com.itmill.toolkit.demo.reservation.gwt.client.ui.ICalendarField;
-import com.itmill.toolkit.demo.reservation.gwt.client.ui.IGoogleMap;
-import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.demo.reservation.gwt.client.ui.ICalendarField;
+import com.vaadin.demo.reservation.gwt.client.ui.IGoogleMap;
+import com.vaadin.terminal.gwt.client.DefaultWidgetSet;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class ReservationWidgetSet extends DefaultWidgetSet {
     @Override
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java b/src/com/vaadin/demo/reservation/gwt/client/ui/ICalendarField.java
index 8b82260418..a11321dfc0 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/ICalendarField.java
+++ b/src/com/vaadin/demo/reservation/gwt/client/ui/ICalendarField.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.reservation.gwt.client.ui;
+package com.vaadin.demo.reservation.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -17,12 +17,12 @@ import com.google.gwt.user.client.ui.FlexTable;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.SourcesTableEvents;
 import com.google.gwt.user.client.ui.TableListener;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.DateTimeService;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.ui.CalendarEntry;
-import com.itmill.toolkit.terminal.gwt.client.ui.ICalendarPanel;
-import com.itmill.toolkit.terminal.gwt.client.ui.IDateField;
+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.CalendarEntry;
+import com.vaadin.terminal.gwt.client.ui.ICalendarPanel;
+import com.vaadin.terminal.gwt.client.ui.IDateField;
 
 public class ICalendarField extends IDateField {
 
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/IGoogleMap.java b/src/com/vaadin/demo/reservation/gwt/client/ui/IGoogleMap.java
index 4d0964ec04..e69bcd16a9 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/client/ui/IGoogleMap.java
+++ b/src/com/vaadin/demo/reservation/gwt/client/ui/IGoogleMap.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.reservation.gwt.client.ui;
+package com.vaadin.demo.reservation.gwt.client.ui;
 
 import java.util.Iterator;
 
@@ -13,9 +13,9 @@ import com.google.gwt.maps.client.event.MarkerClickHandler;
 import com.google.gwt.maps.client.geom.LatLng;
 import com.google.gwt.maps.client.overlay.Marker;
 import com.google.gwt.user.client.ui.Composite;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IGoogleMap extends Composite implements Paintable {
 
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/googlemap/css/googlemap.css b/src/com/vaadin/demo/reservation/gwt/public/reservr/googlemap/css/googlemap.css
index 306f4250f6..306f4250f6 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/googlemap/css/googlemap.css
+++ b/src/com/vaadin/demo/reservation/gwt/public/reservr/googlemap/css/googlemap.css
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/img/calendar-time-selected.gif b/src/com/vaadin/demo/reservation/gwt/public/reservr/img/calendar-time-selected.gif
index 73c7857fc9..73c7857fc9 100755
--- a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/img/calendar-time-selected.gif
+++ b/src/com/vaadin/demo/reservation/gwt/public/reservr/img/calendar-time-selected.gif
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/img/entry-bg.jpg b/src/com/vaadin/demo/reservation/gwt/public/reservr/img/entry-bg.jpg
index a6aeecaf70..a6aeecaf70 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/img/entry-bg.jpg
+++ b/src/com/vaadin/demo/reservation/gwt/public/reservr/img/entry-bg.jpg
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/img/entry-topleft.jpg b/src/com/vaadin/demo/reservation/gwt/public/reservr/img/entry-topleft.jpg
index 53da0b13c0..53da0b13c0 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/img/entry-topleft.jpg
+++ b/src/com/vaadin/demo/reservation/gwt/public/reservr/img/entry-topleft.jpg
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/img/event-bg.jpg b/src/com/vaadin/demo/reservation/gwt/public/reservr/img/event-bg.jpg
index 44d65c4dd7..44d65c4dd7 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/img/event-bg.jpg
+++ b/src/com/vaadin/demo/reservation/gwt/public/reservr/img/event-bg.jpg
diff --git a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/styles.css b/src/com/vaadin/demo/reservation/gwt/public/reservr/styles.css
index 14750f2869..14750f2869 100644
--- a/src/com/itmill/toolkit/demo/reservation/gwt/public/reservr/styles.css
+++ b/src/com/vaadin/demo/reservation/gwt/public/reservr/styles.css
diff --git a/src/com/itmill/toolkit/demo/reservation/simple/AdminView.java b/src/com/vaadin/demo/reservation/simple/AdminView.java
index ac9319c3f6..63b6f4c28c 100644
--- a/src/com/itmill/toolkit/demo/reservation/simple/AdminView.java
+++ b/src/com/vaadin/demo/reservation/simple/AdminView.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.demo.reservation.simple;
+package com.vaadin.demo.reservation.simple;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.AbstractSelect.NewItemHandler;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.AbstractSelect.NewItemHandler;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class AdminView extends OrderedLayout {
 
diff --git a/src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java b/src/com/vaadin/demo/reservation/simple/SampleDB.java
index 3c51f6cfc0..dd0f5f7428 100644
--- a/src/com/itmill/toolkit/demo/reservation/simple/SampleDB.java
+++ b/src/com/vaadin/demo/reservation/simple/SampleDB.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.reservation.simple;
+package com.vaadin.demo.reservation.simple;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -16,10 +16,10 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.QueryContainer;
-import com.itmill.toolkit.demo.reservation.ResourceNotAvailableException;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.QueryContainer;
+import com.vaadin.demo.reservation.ResourceNotAvailableException;
 
 /**
  * Simplified version of Reservr's SampleDB
diff --git a/src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java b/src/com/vaadin/demo/reservation/simple/SimpleReserver.java
index b123bc5105..25c2ec0bd0 100644
--- a/src/com/itmill/toolkit/demo/reservation/simple/SimpleReserver.java
+++ b/src/com/vaadin/demo/reservation/simple/SimpleReserver.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.reservation.simple;
+package com.vaadin.demo.reservation.simple;
 
 import java.security.Principal;
 
@@ -8,16 +8,16 @@ import javax.portlet.PortletMode;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.gwt.server.PortletApplicationContext;
-import com.itmill.toolkit.terminal.gwt.server.PortletApplicationContext.PortletListener;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
 import com.liferay.portal.model.User;
 import com.liferay.portal.service.UserServiceUtil;
+import com.vaadin.Application;
+import com.vaadin.terminal.gwt.server.PortletApplicationContext;
+import com.vaadin.terminal.gwt.server.PortletApplicationContext.PortletListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 /**
  * This is a stripped down version of Reservr example. Idea is to create simple,
diff --git a/src/com/itmill/toolkit/demo/reservation/simple/StdView.java b/src/com/vaadin/demo/reservation/simple/StdView.java
index bbb07aa853..b9699bbbed 100644
--- a/src/com/itmill/toolkit/demo/reservation/simple/StdView.java
+++ b/src/com/vaadin/demo/reservation/simple/StdView.java
@@ -1,25 +1,25 @@
-package com.itmill.toolkit.demo.reservation.simple;
+package com.vaadin.demo.reservation.simple;
 
 import java.util.Calendar;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.demo.reservation.CalendarField;
-import com.itmill.toolkit.demo.reservation.ResourceNotAvailableException;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.demo.reservation.CalendarField;
+import com.vaadin.demo.reservation.ResourceNotAvailableException;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class StdView extends OrderedLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/APIResource.java b/src/com/vaadin/demo/sampler/APIResource.java
index e1973f9140..f7138aac12 100644
--- a/src/com/itmill/toolkit/demo/sampler/APIResource.java
+++ b/src/com/vaadin/demo/sampler/APIResource.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.sampler;
+package com.vaadin.demo.sampler;
 
 /**
  * A NamedExternalResource pointing to the javadoc for the given class. Knows
diff --git a/src/com/itmill/toolkit/demo/sampler/ActiveLink.java b/src/com/vaadin/demo/sampler/ActiveLink.java
index 252a7b12e0..375728aafc 100644
--- a/src/com/itmill/toolkit/demo/sampler/ActiveLink.java
+++ b/src/com/vaadin/demo/sampler/ActiveLink.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.demo.sampler;
+package com.vaadin.demo.sampler;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Resource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 @SuppressWarnings("serial")
 public class ActiveLink extends Link {
diff --git a/src/com/itmill/toolkit/demo/sampler/CodeLabel.java b/src/com/vaadin/demo/sampler/CodeLabel.java
index bc0f0bdf2c..fba8a8ac9f 100644
--- a/src/com/itmill/toolkit/demo/sampler/CodeLabel.java
+++ b/src/com/vaadin/demo/sampler/CodeLabel.java
@@ -1,6 +1,6 @@
-package com.itmill.toolkit.demo.sampler;
+package com.vaadin.demo.sampler;
 
-import com.itmill.toolkit.ui.Label;
+import com.vaadin.ui.Label;
 
 public class CodeLabel extends Label {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/ExampleUtil.java b/src/com/vaadin/demo/sampler/ExampleUtil.java
index 0444cedb86..3888dd25fa 100644
--- a/src/com/itmill/toolkit/demo/sampler/ExampleUtil.java
+++ b/src/com/vaadin/demo/sampler/ExampleUtil.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.demo.sampler;
+package com.vaadin.demo.sampler;
 
 import java.util.Locale;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.ThemeResource;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.HierarchicalContainer;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.ThemeResource;
 
 public final class ExampleUtil {
     public static final String lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut ut massa eget erat dapibus sollicitudin. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque a augue. Praesent non elit. Duis sapien dolor, cursus eget, pulvinar eget, eleifend a, est. Integer in nunc. Vivamus consequat ipsum id sapien. Duis eu elit vel libero posuere luctus. Aliquam ac turpis. Aenean vitae justo in sem iaculis pulvinar. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aliquam sit amet mi. "
diff --git a/src/com/itmill/toolkit/demo/sampler/Feature.java b/src/com/vaadin/demo/sampler/Feature.java
index 54f5805916..e62951b340 100644
--- a/src/com/itmill/toolkit/demo/sampler/Feature.java
+++ b/src/com/vaadin/demo/sampler/Feature.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler;
+package com.vaadin.demo.sampler;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Serializable;
 
-import com.itmill.toolkit.ui.Component;
+import com.vaadin.ui.Component;
 
 /**
  * Represents one feature or sample, with associated example.
diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java b/src/com/vaadin/demo/sampler/FeatureSet.java
index ec521cbc9b..80a8e83206 100644
--- a/src/com/itmill/toolkit/demo/sampler/FeatureSet.java
+++ b/src/com/vaadin/demo/sampler/FeatureSet.java
@@ -1,90 +1,90 @@
-package com.itmill.toolkit.demo.sampler;
+package com.vaadin.demo.sampler;
 
 import java.util.Collections;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.demo.sampler.features.accordions.AccordionDisabled;
-import com.itmill.toolkit.demo.sampler.features.accordions.AccordionIcons;
-import com.itmill.toolkit.demo.sampler.features.blueprints.ProminentPrimaryAction;
-import com.itmill.toolkit.demo.sampler.features.buttons.ButtonLink;
-import com.itmill.toolkit.demo.sampler.features.buttons.ButtonPush;
-import com.itmill.toolkit.demo.sampler.features.buttons.ButtonSwitch;
-import com.itmill.toolkit.demo.sampler.features.commons.Errors;
-import com.itmill.toolkit.demo.sampler.features.commons.Icons;
-import com.itmill.toolkit.demo.sampler.features.commons.Tooltips;
-import com.itmill.toolkit.demo.sampler.features.commons.Validation;
-import com.itmill.toolkit.demo.sampler.features.dates.DateInline;
-import com.itmill.toolkit.demo.sampler.features.dates.DateLocale;
-import com.itmill.toolkit.demo.sampler.features.dates.DatePopup;
-import com.itmill.toolkit.demo.sampler.features.dates.DateResolution;
-import com.itmill.toolkit.demo.sampler.features.form.FormBasic;
-import com.itmill.toolkit.demo.sampler.features.layouts.ApplicationLayout;
-import com.itmill.toolkit.demo.sampler.features.layouts.CustomLayouts;
-import com.itmill.toolkit.demo.sampler.features.layouts.ExpandingComponent;
-import com.itmill.toolkit.demo.sampler.features.layouts.GridLayoutBasic;
-import com.itmill.toolkit.demo.sampler.features.layouts.HorizontalLayoutBasic;
-import com.itmill.toolkit.demo.sampler.features.layouts.LayoutAlignment;
-import com.itmill.toolkit.demo.sampler.features.layouts.LayoutMargin;
-import com.itmill.toolkit.demo.sampler.features.layouts.LayoutSpacing;
-import com.itmill.toolkit.demo.sampler.features.layouts.SplitPanelBasic;
-import com.itmill.toolkit.demo.sampler.features.layouts.VerticalLayoutBasic;
-import com.itmill.toolkit.demo.sampler.features.layouts.WebLayout;
-import com.itmill.toolkit.demo.sampler.features.link.LinkCurrentWindow;
-import com.itmill.toolkit.demo.sampler.features.link.LinkNoDecorations;
-import com.itmill.toolkit.demo.sampler.features.link.LinkSizedWindow;
-import com.itmill.toolkit.demo.sampler.features.notifications.NotificationCustom;
-import com.itmill.toolkit.demo.sampler.features.notifications.NotificationError;
-import com.itmill.toolkit.demo.sampler.features.notifications.NotificationHumanized;
-import com.itmill.toolkit.demo.sampler.features.notifications.NotificationTray;
-import com.itmill.toolkit.demo.sampler.features.notifications.NotificationWarning;
-import com.itmill.toolkit.demo.sampler.features.panels.PanelBasic;
-import com.itmill.toolkit.demo.sampler.features.panels.PanelLight;
-import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxContains;
-import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxInputPrompt;
-import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxNewItems;
-import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxPlain;
-import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxStartsWith;
-import com.itmill.toolkit.demo.sampler.features.selects.ListSelectMultiple;
-import com.itmill.toolkit.demo.sampler.features.selects.ListSelectSingle;
-import com.itmill.toolkit.demo.sampler.features.selects.NativeSelection;
-import com.itmill.toolkit.demo.sampler.features.selects.TwinColumnSelect;
-import com.itmill.toolkit.demo.sampler.features.table.TableActions;
-import com.itmill.toolkit.demo.sampler.features.table.TableCellStyling;
-import com.itmill.toolkit.demo.sampler.features.table.TableColumnAlignment;
-import com.itmill.toolkit.demo.sampler.features.table.TableColumnCollapsing;
-import com.itmill.toolkit.demo.sampler.features.table.TableColumnHeaders;
-import com.itmill.toolkit.demo.sampler.features.table.TableColumnReordering;
-import com.itmill.toolkit.demo.sampler.features.table.TableHeaderIcons;
-import com.itmill.toolkit.demo.sampler.features.table.TableLazyLoading;
-import com.itmill.toolkit.demo.sampler.features.table.TableMouseEvents;
-import com.itmill.toolkit.demo.sampler.features.table.TableRowHeaders;
-import com.itmill.toolkit.demo.sampler.features.table.TableRowStyling;
-import com.itmill.toolkit.demo.sampler.features.table.TableSorting;
-import com.itmill.toolkit.demo.sampler.features.tabsheets.TabSheetDisabled;
-import com.itmill.toolkit.demo.sampler.features.tabsheets.TabSheetIcons;
-import com.itmill.toolkit.demo.sampler.features.tabsheets.TabSheetScrolling;
-import com.itmill.toolkit.demo.sampler.features.text.LabelPlain;
-import com.itmill.toolkit.demo.sampler.features.text.LabelPreformatted;
-import com.itmill.toolkit.demo.sampler.features.text.LabelRich;
-import com.itmill.toolkit.demo.sampler.features.text.RichTextEditor;
-import com.itmill.toolkit.demo.sampler.features.text.TextArea;
-import com.itmill.toolkit.demo.sampler.features.text.TextFieldInputPrompt;
-import com.itmill.toolkit.demo.sampler.features.text.TextFieldSecret;
-import com.itmill.toolkit.demo.sampler.features.text.TextFieldSingle;
-import com.itmill.toolkit.demo.sampler.features.trees.TreeActions;
-import com.itmill.toolkit.demo.sampler.features.trees.TreeMouseEvents;
-import com.itmill.toolkit.demo.sampler.features.trees.TreeMultiSelect;
-import com.itmill.toolkit.demo.sampler.features.trees.TreeSingleSelect;
-import com.itmill.toolkit.demo.sampler.features.windows.NativeWindow;
-import com.itmill.toolkit.demo.sampler.features.windows.Subwindow;
-import com.itmill.toolkit.demo.sampler.features.windows.SubwindowAutoSized;
-import com.itmill.toolkit.demo.sampler.features.windows.SubwindowClose;
-import com.itmill.toolkit.demo.sampler.features.windows.SubwindowModal;
-import com.itmill.toolkit.demo.sampler.features.windows.SubwindowPositioned;
-import com.itmill.toolkit.demo.sampler.features.windows.SubwindowSized;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.HierarchicalContainer;
+import com.vaadin.demo.sampler.features.accordions.AccordionDisabled;
+import com.vaadin.demo.sampler.features.accordions.AccordionIcons;
+import com.vaadin.demo.sampler.features.blueprints.ProminentPrimaryAction;
+import com.vaadin.demo.sampler.features.buttons.ButtonLink;
+import com.vaadin.demo.sampler.features.buttons.ButtonPush;
+import com.vaadin.demo.sampler.features.buttons.ButtonSwitch;
+import com.vaadin.demo.sampler.features.commons.Errors;
+import com.vaadin.demo.sampler.features.commons.Icons;
+import com.vaadin.demo.sampler.features.commons.Tooltips;
+import com.vaadin.demo.sampler.features.commons.Validation;
+import com.vaadin.demo.sampler.features.dates.DateInline;
+import com.vaadin.demo.sampler.features.dates.DateLocale;
+import com.vaadin.demo.sampler.features.dates.DatePopup;
+import com.vaadin.demo.sampler.features.dates.DateResolution;
+import com.vaadin.demo.sampler.features.form.FormBasic;
+import com.vaadin.demo.sampler.features.layouts.ApplicationLayout;
+import com.vaadin.demo.sampler.features.layouts.CustomLayouts;
+import com.vaadin.demo.sampler.features.layouts.ExpandingComponent;
+import com.vaadin.demo.sampler.features.layouts.GridLayoutBasic;
+import com.vaadin.demo.sampler.features.layouts.HorizontalLayoutBasic;
+import com.vaadin.demo.sampler.features.layouts.LayoutAlignment;
+import com.vaadin.demo.sampler.features.layouts.LayoutMargin;
+import com.vaadin.demo.sampler.features.layouts.LayoutSpacing;
+import com.vaadin.demo.sampler.features.layouts.SplitPanelBasic;
+import com.vaadin.demo.sampler.features.layouts.VerticalLayoutBasic;
+import com.vaadin.demo.sampler.features.layouts.WebLayout;
+import com.vaadin.demo.sampler.features.link.LinkCurrentWindow;
+import com.vaadin.demo.sampler.features.link.LinkNoDecorations;
+import com.vaadin.demo.sampler.features.link.LinkSizedWindow;
+import com.vaadin.demo.sampler.features.notifications.NotificationCustom;
+import com.vaadin.demo.sampler.features.notifications.NotificationError;
+import com.vaadin.demo.sampler.features.notifications.NotificationHumanized;
+import com.vaadin.demo.sampler.features.notifications.NotificationTray;
+import com.vaadin.demo.sampler.features.notifications.NotificationWarning;
+import com.vaadin.demo.sampler.features.panels.PanelBasic;
+import com.vaadin.demo.sampler.features.panels.PanelLight;
+import com.vaadin.demo.sampler.features.selects.ComboBoxContains;
+import com.vaadin.demo.sampler.features.selects.ComboBoxInputPrompt;
+import com.vaadin.demo.sampler.features.selects.ComboBoxNewItems;
+import com.vaadin.demo.sampler.features.selects.ComboBoxPlain;
+import com.vaadin.demo.sampler.features.selects.ComboBoxStartsWith;
+import com.vaadin.demo.sampler.features.selects.ListSelectMultiple;
+import com.vaadin.demo.sampler.features.selects.ListSelectSingle;
+import com.vaadin.demo.sampler.features.selects.NativeSelection;
+import com.vaadin.demo.sampler.features.selects.TwinColumnSelect;
+import com.vaadin.demo.sampler.features.table.TableActions;
+import com.vaadin.demo.sampler.features.table.TableCellStyling;
+import com.vaadin.demo.sampler.features.table.TableColumnAlignment;
+import com.vaadin.demo.sampler.features.table.TableColumnCollapsing;
+import com.vaadin.demo.sampler.features.table.TableColumnHeaders;
+import com.vaadin.demo.sampler.features.table.TableColumnReordering;
+import com.vaadin.demo.sampler.features.table.TableHeaderIcons;
+import com.vaadin.demo.sampler.features.table.TableLazyLoading;
+import com.vaadin.demo.sampler.features.table.TableMouseEvents;
+import com.vaadin.demo.sampler.features.table.TableRowHeaders;
+import com.vaadin.demo.sampler.features.table.TableRowStyling;
+import com.vaadin.demo.sampler.features.table.TableSorting;
+import com.vaadin.demo.sampler.features.tabsheets.TabSheetDisabled;
+import com.vaadin.demo.sampler.features.tabsheets.TabSheetIcons;
+import com.vaadin.demo.sampler.features.tabsheets.TabSheetScrolling;
+import com.vaadin.demo.sampler.features.text.LabelPlain;
+import com.vaadin.demo.sampler.features.text.LabelPreformatted;
+import com.vaadin.demo.sampler.features.text.LabelRich;
+import com.vaadin.demo.sampler.features.text.RichTextEditor;
+import com.vaadin.demo.sampler.features.text.TextArea;
+import com.vaadin.demo.sampler.features.text.TextFieldInputPrompt;
+import com.vaadin.demo.sampler.features.text.TextFieldSecret;
+import com.vaadin.demo.sampler.features.text.TextFieldSingle;
+import com.vaadin.demo.sampler.features.trees.TreeActions;
+import com.vaadin.demo.sampler.features.trees.TreeMouseEvents;
+import com.vaadin.demo.sampler.features.trees.TreeMultiSelect;
+import com.vaadin.demo.sampler.features.trees.TreeSingleSelect;
+import com.vaadin.demo.sampler.features.windows.NativeWindow;
+import com.vaadin.demo.sampler.features.windows.Subwindow;
+import com.vaadin.demo.sampler.features.windows.SubwindowAutoSized;
+import com.vaadin.demo.sampler.features.windows.SubwindowClose;
+import com.vaadin.demo.sampler.features.windows.SubwindowModal;
+import com.vaadin.demo.sampler.features.windows.SubwindowPositioned;
+import com.vaadin.demo.sampler.features.windows.SubwindowSized;
 
 /**
  * Contains the FeatureSet implementation and the structure for the feature
diff --git a/src/com/itmill/toolkit/demo/sampler/FeatureView.java b/src/com/vaadin/demo/sampler/FeatureView.java
index f32e122d51..02ff91117b 100644
--- a/src/com/itmill/toolkit/demo/sampler/FeatureView.java
+++ b/src/com/vaadin/demo/sampler/FeatureView.java
@@ -1,21 +1,21 @@
-package com.itmill.toolkit.demo.sampler;
+package com.vaadin.demo.sampler;
 
 import java.util.HashMap;
 
-import com.itmill.toolkit.demo.sampler.ActiveLink.LinkActivatedEvent;
-import com.itmill.toolkit.demo.sampler.ActiveLink.LinkActivatedListener;
-import com.itmill.toolkit.demo.sampler.SamplerApplication.SamplerWindow;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.demo.sampler.ActiveLink.LinkActivatedEvent;
+import com.vaadin.demo.sampler.ActiveLink.LinkActivatedListener;
+import com.vaadin.demo.sampler.SamplerApplication.SamplerWindow;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class FeatureView extends HorizontalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/GoogleAnalytics.java b/src/com/vaadin/demo/sampler/GoogleAnalytics.java
index ac9760592e..345844cee6 100644
--- a/src/com/itmill/toolkit/demo/sampler/GoogleAnalytics.java
+++ b/src/com/vaadin/demo/sampler/GoogleAnalytics.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.demo.sampler;
+package com.vaadin.demo.sampler;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.AbstractComponent;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.AbstractComponent;
 
 public class GoogleAnalytics extends AbstractComponent {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/ModeSwitch.java b/src/com/vaadin/demo/sampler/ModeSwitch.java
index fb6b1d791e..c6565c0c61 100644
--- a/src/com/itmill/toolkit/demo/sampler/ModeSwitch.java
+++ b/src/com/vaadin/demo/sampler/ModeSwitch.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.demo.sampler;
+package com.vaadin.demo.sampler;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.Resource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 @SuppressWarnings("serial")
 public class ModeSwitch extends CustomComponent {
diff --git a/src/com/itmill/toolkit/demo/sampler/NamedExternalResource.java b/src/com/vaadin/demo/sampler/NamedExternalResource.java
index b50bdd91b9..16573f2ebb 100644
--- a/src/com/itmill/toolkit/demo/sampler/NamedExternalResource.java
+++ b/src/com/vaadin/demo/sampler/NamedExternalResource.java
@@ -1,6 +1,6 @@
-package com.itmill.toolkit.demo.sampler;
+package com.vaadin.demo.sampler;
 
-import com.itmill.toolkit.terminal.ExternalResource;
+import com.vaadin.terminal.ExternalResource;
 
 public class NamedExternalResource extends ExternalResource {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java b/src/com/vaadin/demo/sampler/SamplerApplication.java
index 926cfc5310..bab73cd6a9 100644
--- a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
+++ b/src/com/vaadin/demo/sampler/SamplerApplication.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.sampler;
+package com.vaadin.demo.sampler;
 
 import java.net.URI;
 import java.net.URL;
@@ -6,43 +6,43 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.demo.sampler.ActiveLink.LinkActivatedEvent;
-import com.itmill.toolkit.demo.sampler.ModeSwitch.ModeSwitchEvent;
-import com.itmill.toolkit.event.ItemClickEvent;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickListener;
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.PopupView;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.UriFragmentUtility;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
-import com.itmill.toolkit.ui.PopupView.PopupVisibilityEvent;
-import com.itmill.toolkit.ui.UriFragmentUtility.FragmentChangedEvent;
-import com.itmill.toolkit.ui.UriFragmentUtility.FragmentChangedListener;
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.util.HierarchicalContainer;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.demo.sampler.ActiveLink.LinkActivatedEvent;
+import com.vaadin.demo.sampler.ModeSwitch.ModeSwitchEvent;
+import com.vaadin.event.ItemClickEvent;
+import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.PopupView;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.UriFragmentUtility;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.PopupView.PopupVisibilityEvent;
+import com.vaadin.ui.UriFragmentUtility.FragmentChangedEvent;
+import com.vaadin.ui.UriFragmentUtility.FragmentChangedListener;
 
 @SuppressWarnings("serial")
 public class SamplerApplication extends Application {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/accordions/75-AccordionDisabled.png b/src/com/vaadin/demo/sampler/features/accordions/75-AccordionDisabled.png
index fb3e3fe844..fb3e3fe844 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/accordions/75-AccordionDisabled.png
+++ b/src/com/vaadin/demo/sampler/features/accordions/75-AccordionDisabled.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/accordions/75-AccordionIcons.png b/src/com/vaadin/demo/sampler/features/accordions/75-AccordionIcons.png
index c38a1aefc8..c38a1aefc8 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/accordions/75-AccordionIcons.png
+++ b/src/com/vaadin/demo/sampler/features/accordions/75-AccordionIcons.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java b/src/com/vaadin/demo/sampler/features/accordions/AccordionDisabled.java
index 494cb16927..b9be6b4add 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabled.java
+++ b/src/com/vaadin/demo/sampler/features/accordions/AccordionDisabled.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.accordions;
+package com.vaadin.demo.sampler.features.accordions;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Accordion;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Accordion;
 
 public class AccordionDisabled extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabledExample.java b/src/com/vaadin/demo/sampler/features/accordions/AccordionDisabledExample.java
index 14d089809c..ae8e817ade 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionDisabledExample.java
+++ b/src/com/vaadin/demo/sampler/features/accordions/AccordionDisabledExample.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.demo.sampler.features.accordions;
+package com.vaadin.demo.sampler.features.accordions;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
-import com.itmill.toolkit.ui.TabSheet.Tab;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
+import com.vaadin.ui.TabSheet.Tab;
 
 public class AccordionDisabledExample extends VerticalLayout implements
         Accordion.SelectedTabChangeListener, Button.ClickListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionIcons.java b/src/com/vaadin/demo/sampler/features/accordions/AccordionIcons.java
index f5a5e2cad4..d6f0cf9e48 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionIcons.java
+++ b/src/com/vaadin/demo/sampler/features/accordions/AccordionIcons.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.accordions;
+package com.vaadin.demo.sampler.features.accordions;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Accordion;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Accordion;
 
 public class AccordionIcons extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionIconsExample.java b/src/com/vaadin/demo/sampler/features/accordions/AccordionIconsExample.java
index 6ef5894d0e..42047581a0 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/accordions/AccordionIconsExample.java
+++ b/src/com/vaadin/demo/sampler/features/accordions/AccordionIconsExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.accordions;
+package com.vaadin.demo.sampler.features.accordions;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
 
 public class AccordionIconsExample extends HorizontalLayout implements
         Accordion.SelectedTabChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/blueprints/75-ProminentPrimaryAction.png b/src/com/vaadin/demo/sampler/features/blueprints/75-ProminentPrimaryAction.png
index d249324e0c..d249324e0c 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/blueprints/75-ProminentPrimaryAction.png
+++ b/src/com/vaadin/demo/sampler/features/blueprints/75-ProminentPrimaryAction.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java b/src/com/vaadin/demo/sampler/features/blueprints/ProminentPrimaryAction.java
index fff0628d3c..d3eaa06d8b 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java
+++ b/src/com/vaadin/demo/sampler/features/blueprints/ProminentPrimaryAction.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.features.blueprints;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.buttons.ButtonLink;
-import com.itmill.toolkit.demo.sampler.features.buttons.ButtonPush;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Link;
+package com.vaadin.demo.sampler.features.blueprints;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.buttons.ButtonLink;
+import com.vaadin.demo.sampler.features.buttons.ButtonPush;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Link;
 
 public class ProminentPrimaryAction extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java b/src/com/vaadin/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java
index 526d4d9f90..bbbb3d6b6a 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java
+++ b/src/com/vaadin/demo/sampler/features/blueprints/ProminentPrimaryActionExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.blueprints;
+package com.vaadin.demo.sampler.features.blueprints;
 
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class ProminentPrimaryActionExample extends VerticalLayout implements
         Button.ClickListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/75-ButtonLink.png b/src/com/vaadin/demo/sampler/features/buttons/75-ButtonLink.png
index 4e6963f8d1..4e6963f8d1 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/75-ButtonLink.png
+++ b/src/com/vaadin/demo/sampler/features/buttons/75-ButtonLink.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/75-ButtonPush.png b/src/com/vaadin/demo/sampler/features/buttons/75-ButtonPush.png
index 6520e205ff..6520e205ff 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/75-ButtonPush.png
+++ b/src/com/vaadin/demo/sampler/features/buttons/75-ButtonPush.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/75-ButtonSwitch.png b/src/com/vaadin/demo/sampler/features/buttons/75-ButtonSwitch.png
index 6df1b3935d..6df1b3935d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/75-ButtonSwitch.png
+++ b/src/com/vaadin/demo/sampler/features/buttons/75-ButtonSwitch.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java b/src/com/vaadin/demo/sampler/features/buttons/ButtonLink.java
index 899ba3083c..f9f73852bf 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java
+++ b/src/com/vaadin/demo/sampler/features/buttons/ButtonLink.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.features.buttons;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.blueprints.ProminentPrimaryAction;
-import com.itmill.toolkit.demo.sampler.features.link.LinkCurrentWindow;
-import com.itmill.toolkit.ui.Button;
+package com.vaadin.demo.sampler.features.buttons;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.blueprints.ProminentPrimaryAction;
+import com.vaadin.demo.sampler.features.link.LinkCurrentWindow;
+import com.vaadin.ui.Button;
 
 public class ButtonLink extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLinkExample.java b/src/com/vaadin/demo/sampler/features/buttons/ButtonLinkExample.java
index b6889b9f48..4b2e00ea7a 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLinkExample.java
+++ b/src/com/vaadin/demo/sampler/features/buttons/ButtonLinkExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.buttons;
+package com.vaadin.demo.sampler.features.buttons;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class ButtonLinkExample extends VerticalLayout implements
         Button.ClickListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java b/src/com/vaadin/demo/sampler/features/buttons/ButtonPush.java
index 305f06e6d7..4b9dc23480 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java
+++ b/src/com/vaadin/demo/sampler/features/buttons/ButtonPush.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.buttons;
+package com.vaadin.demo.sampler.features.buttons;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.blueprints.ProminentPrimaryAction;
-import com.itmill.toolkit.ui.Button;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.blueprints.ProminentPrimaryAction;
+import com.vaadin.ui.Button;
 
 public class ButtonPush extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPushExample.java b/src/com/vaadin/demo/sampler/features/buttons/ButtonPushExample.java
index 2bffc43ed2..67d6e61b60 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPushExample.java
+++ b/src/com/vaadin/demo/sampler/features/buttons/ButtonPushExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.buttons;
+package com.vaadin.demo.sampler.features.buttons;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class ButtonPushExample extends VerticalLayout implements
         Button.ClickListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java b/src/com/vaadin/demo/sampler/features/buttons/ButtonSwitch.java
index f9c578f69a..4a86668f62 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java
+++ b/src/com/vaadin/demo/sampler/features/buttons/ButtonSwitch.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.buttons;
+package com.vaadin.demo.sampler.features.buttons;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Button;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Button;
 
 public class ButtonSwitch extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitchExample.java b/src/com/vaadin/demo/sampler/features/buttons/ButtonSwitchExample.java
index 9beefd825a..5bc0442ce4 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitchExample.java
+++ b/src/com/vaadin/demo/sampler/features/buttons/ButtonSwitchExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.buttons;
+package com.vaadin.demo.sampler.features.buttons;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class ButtonSwitchExample extends VerticalLayout implements
         Button.ClickListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/75-Errors.png b/src/com/vaadin/demo/sampler/features/commons/75-Errors.png
index 26b29ce24f..26b29ce24f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/75-Errors.png
+++ b/src/com/vaadin/demo/sampler/features/commons/75-Errors.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/75-Icons.png b/src/com/vaadin/demo/sampler/features/commons/75-Icons.png
index 23c733579b..23c733579b 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/75-Icons.png
+++ b/src/com/vaadin/demo/sampler/features/commons/75-Icons.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/75-Tooltips.png b/src/com/vaadin/demo/sampler/features/commons/75-Tooltips.png
index 217daeb920..217daeb920 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/75-Tooltips.png
+++ b/src/com/vaadin/demo/sampler/features/commons/75-Tooltips.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/75-Validation.png b/src/com/vaadin/demo/sampler/features/commons/75-Validation.png
index 058ec7db9f..058ec7db9f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/75-Validation.png
+++ b/src/com/vaadin/demo/sampler/features/commons/75-Validation.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Errors.java b/src/com/vaadin/demo/sampler/features/commons/Errors.java
index 10f12f1295..5cac780621 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/Errors.java
+++ b/src/com/vaadin/demo/sampler/features/commons/Errors.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.commons;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.form.FormBasic;
-import com.itmill.toolkit.demo.sampler.features.notifications.NotificationError;
-import com.itmill.toolkit.ui.AbstractComponent;
+package com.vaadin.demo.sampler.features.commons;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.form.FormBasic;
+import com.vaadin.demo.sampler.features.notifications.NotificationError;
+import com.vaadin.ui.AbstractComponent;
 
 public class Errors extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/ErrorsExample.java b/src/com/vaadin/demo/sampler/features/commons/ErrorsExample.java
index 8b1da6415d..fc5b1eff24 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/ErrorsExample.java
+++ b/src/com/vaadin/demo/sampler/features/commons/ErrorsExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.commons;
+package com.vaadin.demo.sampler.features.commons;
 
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
 
 public class ErrorsExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java b/src/com/vaadin/demo/sampler/features/commons/Icons.java
index 3db63efe6c..0baf8fca6e 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java
+++ b/src/com/vaadin/demo/sampler/features/commons/Icons.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.demo.sampler.features.commons;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.terminal.ApplicationResource;
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.FileResource;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.StreamResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Component;
+package com.vaadin.demo.sampler.features.commons;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.terminal.ApplicationResource;
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.FileResource;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.StreamResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Component;
 
 public class Icons extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/IconsExample.java b/src/com/vaadin/demo/sampler/features/commons/IconsExample.java
index 1adaea399b..39d31dbfcf 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/IconsExample.java
+++ b/src/com/vaadin/demo/sampler/features/commons/IconsExample.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.features.commons;
+package com.vaadin.demo.sampler.features.commons;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
 
 public class IconsExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java b/src/com/vaadin/demo/sampler/features/commons/Tooltips.java
index ea74cebab0..eac86146fe 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java
+++ b/src/com/vaadin/demo/sampler/features/commons/Tooltips.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.commons;
+package com.vaadin.demo.sampler.features.commons;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.AbstractComponent;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.AbstractComponent;
 
 public class Tooltips extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/TooltipsExample.java b/src/com/vaadin/demo/sampler/features/commons/TooltipsExample.java
index d5722254c4..932286df76 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/TooltipsExample.java
+++ b/src/com/vaadin/demo/sampler/features/commons/TooltipsExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.commons;
+package com.vaadin.demo.sampler.features.commons;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TooltipsExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Validation.java b/src/com/vaadin/demo/sampler/features/commons/Validation.java
index 566578303c..3ff516a5ba 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/Validation.java
+++ b/src/com/vaadin/demo/sampler/features/commons/Validation.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.demo.sampler.features.commons;
-
-import com.itmill.toolkit.data.Validatable;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.form.FormPojoExample;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
+package com.vaadin.demo.sampler.features.commons;
+
+import com.vaadin.data.Validatable;
+import com.vaadin.data.Validator;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.form.FormPojoExample;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
 
 public class Validation extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/ValidationExample.java b/src/com/vaadin/demo/sampler/features/commons/ValidationExample.java
index 19444045a9..873b641ec7 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/ValidationExample.java
+++ b/src/com/vaadin/demo/sampler/features/commons/ValidationExample.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.demo.sampler.features.commons;
+package com.vaadin.demo.sampler.features.commons;
 
 import java.util.HashSet;
 
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.validator.CompositeValidator;
-import com.itmill.toolkit.data.validator.StringLengthValidator;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Validator;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.data.validator.CompositeValidator;
+import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
 
 public class ValidationExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/75-DateInline.png b/src/com/vaadin/demo/sampler/features/dates/75-DateInline.png
index 4368f420a9..4368f420a9 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/75-DateInline.png
+++ b/src/com/vaadin/demo/sampler/features/dates/75-DateInline.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/75-DateLocale.png b/src/com/vaadin/demo/sampler/features/dates/75-DateLocale.png
index a608e59873..a608e59873 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/75-DateLocale.png
+++ b/src/com/vaadin/demo/sampler/features/dates/75-DateLocale.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/75-DatePopup.png b/src/com/vaadin/demo/sampler/features/dates/75-DatePopup.png
index 1030469dc2..1030469dc2 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/75-DatePopup.png
+++ b/src/com/vaadin/demo/sampler/features/dates/75-DatePopup.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/75-DateResolution.png b/src/com/vaadin/demo/sampler/features/dates/75-DateResolution.png
index ca6ddcf16e..ca6ddcf16e 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/75-DateResolution.png
+++ b/src/com/vaadin/demo/sampler/features/dates/75-DateResolution.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DateInline.java b/src/com/vaadin/demo/sampler/features/dates/DateInline.java
index e4b6d31aee..46a298f9d8 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/DateInline.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DateInline.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.dates;
+package com.vaadin.demo.sampler.features.dates;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.InlineDateField;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.InlineDateField;
 
 public class DateInline extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DateInlineExample.java b/src/com/vaadin/demo/sampler/features/dates/DateInlineExample.java
index 7b12738142..5490b77a61 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/DateInlineExample.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DateInlineExample.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.dates;
+package com.vaadin.demo.sampler.features.dates;
 
 import java.text.DateFormat;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.InlineDateField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.InlineDateField;
+import com.vaadin.ui.VerticalLayout;
 
 public class DateInlineExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DateLocale.java b/src/com/vaadin/demo/sampler/features/dates/DateLocale.java
index c859fa83e3..f150afcdfd 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/DateLocale.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DateLocale.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.features.dates;
+package com.vaadin.demo.sampler.features.dates;
 
 import java.util.Locale;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.InlineDateField;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.InlineDateField;
 
 public class DateLocale extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DateLocaleExample.java b/src/com/vaadin/demo/sampler/features/dates/DateLocaleExample.java
index bc368acd15..1e2e810b16 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/DateLocaleExample.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DateLocaleExample.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.demo.sampler.features.dates;
+package com.vaadin.demo.sampler.features.dates;
 
 import java.util.Locale;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.demo.sampler.ExampleUtil;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.InlineDateField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.InlineDateField;
+import com.vaadin.ui.VerticalLayout;
 
 public class DateLocaleExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DatePopup.java b/src/com/vaadin/demo/sampler/features/dates/DatePopup.java
index 83bdd9fc9a..fcc51cc853 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/DatePopup.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DatePopup.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.dates;
+package com.vaadin.demo.sampler.features.dates;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.PopupDateField;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.PopupDateField;
 
 public class DatePopup extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DatePopupExample.java b/src/com/vaadin/demo/sampler/features/dates/DatePopupExample.java
index 44592dd535..31e77a0e4a 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/DatePopupExample.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DatePopupExample.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.features.dates;
+package com.vaadin.demo.sampler.features.dates;
 
 import java.text.DateFormat;
 import java.util.Date;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.PopupDateField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.PopupDateField;
+import com.vaadin.ui.VerticalLayout;
 
 public class DatePopupExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DateResolution.java b/src/com/vaadin/demo/sampler/features/dates/DateResolution.java
index 479b4e9595..ba3d7d112f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/DateResolution.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DateResolution.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.dates;
+package com.vaadin.demo.sampler.features.dates;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.InlineDateField;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.InlineDateField;
 
 public class DateResolution extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/dates/DateResolutionExample.java b/src/com/vaadin/demo/sampler/features/dates/DateResolutionExample.java
index 54e53b2ac1..dbbceeb7ec 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/dates/DateResolutionExample.java
+++ b/src/com/vaadin/demo/sampler/features/dates/DateResolutionExample.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.features.dates;
+package com.vaadin.demo.sampler.features.dates;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.InlineDateField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.InlineDateField;
+import com.vaadin.ui.VerticalLayout;
 
 public class DateResolutionExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/form/75-FormBasic.png b/src/com/vaadin/demo/sampler/features/form/75-FormBasic.png
index 5044c729a6..5044c729a6 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/form/75-FormBasic.png
+++ b/src/com/vaadin/demo/sampler/features/form/75-FormBasic.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/form/75-FormPojo.png b/src/com/vaadin/demo/sampler/features/form/75-FormPojo.png
index df237b7cfc..df237b7cfc 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/form/75-FormPojo.png
+++ b/src/com/vaadin/demo/sampler/features/form/75-FormPojo.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/form/FormBasic.java b/src/com/vaadin/demo/sampler/features/form/FormBasic.java
index ccb036ea99..25bd9197d2 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/form/FormBasic.java
+++ b/src/com/vaadin/demo/sampler/features/form/FormBasic.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.demo.sampler.features.form;
-
-import com.itmill.toolkit.data.Validatable;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.commons.Errors;
-import com.itmill.toolkit.demo.sampler.features.commons.Validation;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
+package com.vaadin.demo.sampler.features.form;
+
+import com.vaadin.data.Validatable;
+import com.vaadin.data.Validator;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.commons.Errors;
+import com.vaadin.demo.sampler.features.commons.Validation;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
 
 public class FormBasic extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/form/FormPojo.java b/src/com/vaadin/demo/sampler/features/form/FormPojo.java
index 1e80239949..b2f92faa14 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/form/FormPojo.java
+++ b/src/com/vaadin/demo/sampler/features/form/FormPojo.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.demo.sampler.features.form;
-
-import com.itmill.toolkit.data.Validatable;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.commons.Errors;
-import com.itmill.toolkit.demo.sampler.features.commons.Validation;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
+package com.vaadin.demo.sampler.features.form;
+
+import com.vaadin.data.Validatable;
+import com.vaadin.data.Validator;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.commons.Errors;
+import com.vaadin.demo.sampler.features.commons.Validation;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
 
 public class FormPojo extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/form/FormPojoExample.java b/src/com/vaadin/demo/sampler/features/form/FormPojoExample.java
index 22ed844fd4..e8e0ebb4b2 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/form/FormPojoExample.java
+++ b/src/com/vaadin/demo/sampler/features/form/FormPojoExample.java
@@ -1,26 +1,26 @@
-package com.itmill.toolkit.demo.sampler.features.form;
+package com.vaadin.demo.sampler.features.form;
 
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.UUID;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.data.validator.StringLengthValidator;
-import com.itmill.toolkit.demo.sampler.ExampleUtil;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Item;
+import com.vaadin.data.Validator;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 @SuppressWarnings("serial")
 public class FormPojoExample extends VerticalLayout {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-ApplicationLayout.png b/src/com/vaadin/demo/sampler/features/layouts/75-ApplicationLayout.png
index ee1d0a1c78..ee1d0a1c78 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-ApplicationLayout.png
+++ b/src/com/vaadin/demo/sampler/features/layouts/75-ApplicationLayout.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-CustomLayouts.png b/src/com/vaadin/demo/sampler/features/layouts/75-CustomLayouts.png
index a37e342d9e..a37e342d9e 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-CustomLayouts.png
+++ b/src/com/vaadin/demo/sampler/features/layouts/75-CustomLayouts.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-ExpandingComponent.png b/src/com/vaadin/demo/sampler/features/layouts/75-ExpandingComponent.png
index dcc9ac5550..dcc9ac5550 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-ExpandingComponent.png
+++ b/src/com/vaadin/demo/sampler/features/layouts/75-ExpandingComponent.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-GridLayoutBasic.png b/src/com/vaadin/demo/sampler/features/layouts/75-GridLayoutBasic.png
index a9c298cf3f..a9c298cf3f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-GridLayoutBasic.png
+++ b/src/com/vaadin/demo/sampler/features/layouts/75-GridLayoutBasic.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-HorizontalLayoutBasic.png b/src/com/vaadin/demo/sampler/features/layouts/75-HorizontalLayoutBasic.png
index d83a7183d5..d83a7183d5 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-HorizontalLayoutBasic.png
+++ b/src/com/vaadin/demo/sampler/features/layouts/75-HorizontalLayoutBasic.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-LayoutAlignment.png b/src/com/vaadin/demo/sampler/features/layouts/75-LayoutAlignment.png
index 3aedc76879..3aedc76879 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-LayoutAlignment.png
+++ b/src/com/vaadin/demo/sampler/features/layouts/75-LayoutAlignment.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-LayoutMargin.png b/src/com/vaadin/demo/sampler/features/layouts/75-LayoutMargin.png
index 802ef00a86..802ef00a86 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-LayoutMargin.png
+++ b/src/com/vaadin/demo/sampler/features/layouts/75-LayoutMargin.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-LayoutSpacing.png b/src/com/vaadin/demo/sampler/features/layouts/75-LayoutSpacing.png
index 502bdc169b..502bdc169b 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-LayoutSpacing.png
+++ b/src/com/vaadin/demo/sampler/features/layouts/75-LayoutSpacing.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-SplitPanelBasic.png b/src/com/vaadin/demo/sampler/features/layouts/75-SplitPanelBasic.png
index 562d6af32b..562d6af32b 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-SplitPanelBasic.png
+++ b/src/com/vaadin/demo/sampler/features/layouts/75-SplitPanelBasic.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-VerticalLayoutBasic.png b/src/com/vaadin/demo/sampler/features/layouts/75-VerticalLayoutBasic.png
index 2e6bf6b484..2e6bf6b484 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-VerticalLayoutBasic.png
+++ b/src/com/vaadin/demo/sampler/features/layouts/75-VerticalLayoutBasic.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-WebLayout.png b/src/com/vaadin/demo/sampler/features/layouts/75-WebLayout.png
index a9405c768c..a9405c768c 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/75-WebLayout.png
+++ b/src/com/vaadin/demo/sampler/features/layouts/75-WebLayout.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/ApplicationLayout.java b/src/com/vaadin/demo/sampler/features/layouts/ApplicationLayout.java
index 1e350bc200..38194b4c64 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/ApplicationLayout.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/ApplicationLayout.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.VerticalLayout;
 
 public class ApplicationLayout extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/ApplicationLayoutExample.java b/src/com/vaadin/demo/sampler/features/layouts/ApplicationLayoutExample.java
index 8701e123da..79b6e1258f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/ApplicationLayoutExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/ApplicationLayoutExample.java
@@ -1,18 +1,18 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
 import java.util.Iterator;
 
-import com.itmill.toolkit.demo.sampler.ExampleUtil;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.CloseEvent;
+import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.CloseEvent;
 
 public class ApplicationLayoutExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/CustomLayouts.java b/src/com/vaadin/demo/sampler/features/layouts/CustomLayouts.java
index 30947ac798..8ade132ac2 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/CustomLayouts.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/CustomLayouts.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.CustomLayout;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.CustomLayout;
 
 public class CustomLayouts extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/CustomLayoutsExample.java b/src/com/vaadin/demo/sampler/features/layouts/CustomLayoutsExample.java
index e9ff2cd525..f829009555 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/CustomLayoutsExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/CustomLayoutsExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
 
 public class CustomLayoutsExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/ExpandingComponent.java b/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponent.java
index 315cf421a8..8a58d73eb7 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/ExpandingComponent.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponent.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.HorizontalLayout;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.HorizontalLayout;
 
 public class ExpandingComponent extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/ExpandingComponentExample.java b/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponentExample.java
index 84772cc16b..1638fbe8a2 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/ExpandingComponentExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/ExpandingComponentExample.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.VerticalLayout;
 
 public class ExpandingComponentExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/GridLayoutBasic.java b/src/com/vaadin/demo/sampler/features/layouts/GridLayoutBasic.java
index 6010e26c67..e850e5ab4c 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/GridLayoutBasic.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/GridLayoutBasic.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.GridLayout;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.GridLayout;
 
 public class GridLayoutBasic extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/GridLayoutBasicExample.java b/src/com/vaadin/demo/sampler/features/layouts/GridLayoutBasicExample.java
index b13f967005..6b5e430664 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/GridLayoutBasicExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/GridLayoutBasicExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.VerticalLayout;
 
 public class GridLayoutBasicExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/HorizontalLayoutBasic.java b/src/com/vaadin/demo/sampler/features/layouts/HorizontalLayoutBasic.java
index e50ef4cde4..3c72b2733f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/HorizontalLayoutBasic.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/HorizontalLayoutBasic.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.HorizontalLayout;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.HorizontalLayout;
 
 public class HorizontalLayoutBasic extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/HorizontalLayoutBasicExample.java b/src/com/vaadin/demo/sampler/features/layouts/HorizontalLayoutBasicExample.java
index 01186d2010..4b09f218bc 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/HorizontalLayoutBasicExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/HorizontalLayoutBasicExample.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
 
 public class HorizontalLayoutBasicExample extends HorizontalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutAlignment.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignment.java
index 236083163c..531ae1acdc 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutAlignment.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignment.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.VerticalLayout;
 
 public class LayoutAlignment extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutAlignmentExample.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignmentExample.java
index 8f49f254e4..853aedd003 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutAlignmentExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutAlignmentExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.terminal.gwt.client.ui.AlignmentInfo.Bits;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.terminal.gwt.client.ui.AlignmentInfo.Bits;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.VerticalLayout;
 
 public class LayoutAlignmentExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutMargin.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java
index 526046b292..e2c88434d9 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutMargin.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutMargin.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.VerticalLayout;
 
 public class LayoutMargin extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutMarginExample.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutMarginExample.java
index 2f4d8936b5..355486db79 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutMarginExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutMarginExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class LayoutMarginExample extends GridLayout implements
         Button.ClickListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutSpacing.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacing.java
index 1beebcb3c1..b6d214289e 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutSpacing.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacing.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.VerticalLayout;
 
 public class LayoutSpacing extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutSpacingExample.java b/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacingExample.java
index b2d1126e3b..62891ac77d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/LayoutSpacingExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/LayoutSpacingExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class LayoutSpacingExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/SplitPanelBasic.java b/src/com/vaadin/demo/sampler/features/layouts/SplitPanelBasic.java
index a6b4472fc0..3ac9fe606e 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/SplitPanelBasic.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/SplitPanelBasic.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.SplitPanel;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.SplitPanel;
 
 public class SplitPanelBasic extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/SplitPanelBasicExample.java b/src/com/vaadin/demo/sampler/features/layouts/SplitPanelBasicExample.java
index 442a9763c2..b1dd1972ab 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/SplitPanelBasicExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/SplitPanelBasicExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class SplitPanelBasicExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/VerticalLayoutBasic.java b/src/com/vaadin/demo/sampler/features/layouts/VerticalLayoutBasic.java
index 8c1f35dd25..64a085abda 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/VerticalLayoutBasic.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/VerticalLayoutBasic.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.VerticalLayout;
 
 public class VerticalLayoutBasic extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/VerticalLayoutBasicExample.java b/src/com/vaadin/demo/sampler/features/layouts/VerticalLayoutBasicExample.java
index c7afc7e3b6..7881f325c2 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/VerticalLayoutBasicExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/VerticalLayoutBasicExample.java
@@ -1,7 +1,7 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
 
 public class VerticalLayoutBasicExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/WebLayout.java b/src/com/vaadin/demo/sampler/features/layouts/WebLayout.java
index bc1241d2f9..6edad21e4f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/WebLayout.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/WebLayout.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.VerticalLayout;
 
 public class WebLayout extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/layouts/WebLayoutExample.java b/src/com/vaadin/demo/sampler/features/layouts/WebLayoutExample.java
index 5b1a5c3c26..a0fe32df5d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/layouts/WebLayoutExample.java
+++ b/src/com/vaadin/demo/sampler/features/layouts/WebLayoutExample.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.demo.sampler.features.layouts;
+package com.vaadin.demo.sampler.features.layouts;
 
 import java.util.Iterator;
 
-import com.itmill.toolkit.demo.sampler.ExampleUtil;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.CloseEvent;
+import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.CloseEvent;
 
 public class WebLayoutExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/75-LinkCurrentWindow.png b/src/com/vaadin/demo/sampler/features/link/75-LinkCurrentWindow.png
index c9bcfd729e..c9bcfd729e 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/75-LinkCurrentWindow.png
+++ b/src/com/vaadin/demo/sampler/features/link/75-LinkCurrentWindow.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/75-LinkNoDecorations.png b/src/com/vaadin/demo/sampler/features/link/75-LinkNoDecorations.png
index 6ec2449a59..6ec2449a59 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/75-LinkNoDecorations.png
+++ b/src/com/vaadin/demo/sampler/features/link/75-LinkNoDecorations.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/75-LinkSizedWindow.png b/src/com/vaadin/demo/sampler/features/link/75-LinkSizedWindow.png
index 46333cd88d..46333cd88d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/75-LinkSizedWindow.png
+++ b/src/com/vaadin/demo/sampler/features/link/75-LinkSizedWindow.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java b/src/com/vaadin/demo/sampler/features/link/LinkCurrentWindow.java
index 602265f8e9..4880f42d0b 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java
+++ b/src/com/vaadin/demo/sampler/features/link/LinkCurrentWindow.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.link;
+package com.vaadin.demo.sampler.features.link;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.buttons.ButtonLink;
-import com.itmill.toolkit.ui.Link;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.buttons.ButtonLink;
+import com.vaadin.ui.Link;
 
 public class LinkCurrentWindow extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindowExample.java b/src/com/vaadin/demo/sampler/features/link/LinkCurrentWindowExample.java
index 5d813c7f67..153f572258 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindowExample.java
+++ b/src/com/vaadin/demo/sampler/features/link/LinkCurrentWindowExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.link;
+package com.vaadin.demo.sampler.features.link;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.VerticalLayout;
 
 public class LinkCurrentWindowExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java b/src/com/vaadin/demo/sampler/features/link/LinkNoDecorations.java
index a2f7ecefc5..7f20dc65c8 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java
+++ b/src/com/vaadin/demo/sampler/features/link/LinkNoDecorations.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.link;
+package com.vaadin.demo.sampler.features.link;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.buttons.ButtonLink;
-import com.itmill.toolkit.ui.Link;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.buttons.ButtonLink;
+import com.vaadin.ui.Link;
 
 public class LinkNoDecorations extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorationsExample.java b/src/com/vaadin/demo/sampler/features/link/LinkNoDecorationsExample.java
index 15ab06676c..65ac59f12d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorationsExample.java
+++ b/src/com/vaadin/demo/sampler/features/link/LinkNoDecorationsExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.link;
+package com.vaadin.demo.sampler.features.link;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.VerticalLayout;
 
 public class LinkNoDecorationsExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java b/src/com/vaadin/demo/sampler/features/link/LinkSizedWindow.java
index 97ee0a0ac9..9b8f8e5488 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java
+++ b/src/com/vaadin/demo/sampler/features/link/LinkSizedWindow.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.link;
+package com.vaadin.demo.sampler.features.link;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.buttons.ButtonLink;
-import com.itmill.toolkit.ui.Link;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.buttons.ButtonLink;
+import com.vaadin.ui.Link;
 
 public class LinkSizedWindow extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindowExample.java b/src/com/vaadin/demo/sampler/features/link/LinkSizedWindowExample.java
index dcb656d2f4..8d47deea45 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindowExample.java
+++ b/src/com/vaadin/demo/sampler/features/link/LinkSizedWindowExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.link;
+package com.vaadin.demo.sampler.features.link;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.VerticalLayout;
 
 public class LinkSizedWindowExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/75-NotificationCustom.png b/src/com/vaadin/demo/sampler/features/notifications/75-NotificationCustom.png
index 87aebc88f0..87aebc88f0 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/75-NotificationCustom.png
+++ b/src/com/vaadin/demo/sampler/features/notifications/75-NotificationCustom.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/75-NotificationError.png b/src/com/vaadin/demo/sampler/features/notifications/75-NotificationError.png
index e16a49ddef..e16a49ddef 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/75-NotificationError.png
+++ b/src/com/vaadin/demo/sampler/features/notifications/75-NotificationError.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/75-NotificationHumanized.png b/src/com/vaadin/demo/sampler/features/notifications/75-NotificationHumanized.png
index a2dd395f84..a2dd395f84 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/75-NotificationHumanized.png
+++ b/src/com/vaadin/demo/sampler/features/notifications/75-NotificationHumanized.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/75-NotificationTray.png b/src/com/vaadin/demo/sampler/features/notifications/75-NotificationTray.png
index 31c256673f..31c256673f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/75-NotificationTray.png
+++ b/src/com/vaadin/demo/sampler/features/notifications/75-NotificationTray.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/75-NotificationWarning.png b/src/com/vaadin/demo/sampler/features/notifications/75-NotificationWarning.png
index 0626d17bda..0626d17bda 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/75-NotificationWarning.png
+++ b/src/com/vaadin/demo/sampler/features/notifications/75-NotificationWarning.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationCustom.java
index 5449fdc60a..dc6780d3c6 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationCustom.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.notifications;
+package com.vaadin.demo.sampler.features.notifications;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Window;
 
 public class NotificationCustom extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustomExample.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationCustomExample.java
index 7a77b4a2da..ce20e77827 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustomExample.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationCustomExample.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.demo.sampler.features.notifications;
-
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.Slider;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.Notification;
+package com.vaadin.demo.sampler.features.notifications;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.Slider;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.Notification;
 
 public class NotificationCustomExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationError.java
index 3cb6793894..406249658a 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationError.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.notifications;
+package com.vaadin.demo.sampler.features.notifications;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Window;
 
 public class NotificationError extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationErrorExample.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationErrorExample.java
index 203e497899..3860e7fd17 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationErrorExample.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationErrorExample.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.notifications;
-
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.Notification;
+package com.vaadin.demo.sampler.features.notifications;
+
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.Notification;
 
 public class NotificationErrorExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationHumanized.java
index 4b68f5383a..dfc14d3466 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationHumanized.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.notifications;
+package com.vaadin.demo.sampler.features.notifications;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Window;
 
 public class NotificationHumanized extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanizedExample.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationHumanizedExample.java
index 87079e9d11..8d70a2e2b9 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanizedExample.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationHumanizedExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.notifications;
+package com.vaadin.demo.sampler.features.notifications;
 
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class NotificationHumanizedExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationTray.java
index 8c5451ba3c..9401f90d0b 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationTray.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.notifications;
+package com.vaadin.demo.sampler.features.notifications;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Window;
 
 public class NotificationTray extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTrayExample.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationTrayExample.java
index e6295d0c2b..a7d78ebfca 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTrayExample.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationTrayExample.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.notifications;
-
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.Notification;
+package com.vaadin.demo.sampler.features.notifications;
+
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.Notification;
 
 public class NotificationTrayExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationWarning.java
index 0db7cf9631..303361c6d1 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationWarning.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.notifications;
+package com.vaadin.demo.sampler.features.notifications;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Window;
 
 public class NotificationWarning extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarningExample.java b/src/com/vaadin/demo/sampler/features/notifications/NotificationWarningExample.java
index a6b3ceecc3..ae98aeb739 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarningExample.java
+++ b/src/com/vaadin/demo/sampler/features/notifications/NotificationWarningExample.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.notifications;
-
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.Notification;
+package com.vaadin.demo.sampler.features.notifications;
+
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.Notification;
 
 public class NotificationWarningExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/panels/75-PanelBasic.png b/src/com/vaadin/demo/sampler/features/panels/75-PanelBasic.png
index 3307b22067..3307b22067 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/panels/75-PanelBasic.png
+++ b/src/com/vaadin/demo/sampler/features/panels/75-PanelBasic.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/panels/75-PanelLight.png b/src/com/vaadin/demo/sampler/features/panels/75-PanelLight.png
index c36e16af47..c36e16af47 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/panels/75-PanelLight.png
+++ b/src/com/vaadin/demo/sampler/features/panels/75-PanelLight.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java b/src/com/vaadin/demo/sampler/features/panels/PanelBasic.java
index ad42a5c4c7..5d659b04a5 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasic.java
+++ b/src/com/vaadin/demo/sampler/features/panels/PanelBasic.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.panels;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Panel;
+package com.vaadin.demo.sampler.features.panels;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Panel;
 
 public class PanelBasic extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasicExample.java b/src/com/vaadin/demo/sampler/features/panels/PanelBasicExample.java
index d77d21c6f8..498337ff43 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelBasicExample.java
+++ b/src/com/vaadin/demo/sampler/features/panels/PanelBasicExample.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.panels;
-
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.demo.sampler.features.panels;
+
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class PanelBasicExample extends VerticalLayout implements ClickListener {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelLight.java b/src/com/vaadin/demo/sampler/features/panels/PanelLight.java
index 024e9abfb7..ddb4138913 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelLight.java
+++ b/src/com/vaadin/demo/sampler/features/panels/PanelLight.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.panels;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Panel;
+package com.vaadin.demo.sampler.features.panels;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Panel;
 
 public class PanelLight extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelLightExample.java b/src/com/vaadin/demo/sampler/features/panels/PanelLightExample.java
index d4dadb4914..38aa53ca5f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/panels/PanelLightExample.java
+++ b/src/com/vaadin/demo/sampler/features/panels/PanelLightExample.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.panels;
-
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.demo.sampler.features.panels;
+
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class PanelLightExample extends VerticalLayout implements ClickListener {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ComboBoxContains.png b/src/com/vaadin/demo/sampler/features/selects/75-ComboBoxContains.png
index af8cdf2215..af8cdf2215 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ComboBoxContains.png
+++ b/src/com/vaadin/demo/sampler/features/selects/75-ComboBoxContains.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ComboBoxInputPrompt.png b/src/com/vaadin/demo/sampler/features/selects/75-ComboBoxInputPrompt.png
index 3ef7a48faa..3ef7a48faa 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ComboBoxInputPrompt.png
+++ b/src/com/vaadin/demo/sampler/features/selects/75-ComboBoxInputPrompt.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ComboBoxNewItems.png b/src/com/vaadin/demo/sampler/features/selects/75-ComboBoxNewItems.png
index c79228fdcf..c79228fdcf 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ComboBoxNewItems.png
+++ b/src/com/vaadin/demo/sampler/features/selects/75-ComboBoxNewItems.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ComboBoxPlain.png b/src/com/vaadin/demo/sampler/features/selects/75-ComboBoxPlain.png
index 603c8c6cab..603c8c6cab 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ComboBoxPlain.png
+++ b/src/com/vaadin/demo/sampler/features/selects/75-ComboBoxPlain.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ComboBoxStartsWith.png b/src/com/vaadin/demo/sampler/features/selects/75-ComboBoxStartsWith.png
index 2b5d0f1bd0..2b5d0f1bd0 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ComboBoxStartsWith.png
+++ b/src/com/vaadin/demo/sampler/features/selects/75-ComboBoxStartsWith.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ListSelectMultiple.png b/src/com/vaadin/demo/sampler/features/selects/75-ListSelectMultiple.png
index 628b5787f8..628b5787f8 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ListSelectMultiple.png
+++ b/src/com/vaadin/demo/sampler/features/selects/75-ListSelectMultiple.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ListSelectSingle.png b/src/com/vaadin/demo/sampler/features/selects/75-ListSelectSingle.png
index b4ac1f4999..b4ac1f4999 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/75-ListSelectSingle.png
+++ b/src/com/vaadin/demo/sampler/features/selects/75-ListSelectSingle.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/75-NativeSelection.png b/src/com/vaadin/demo/sampler/features/selects/75-NativeSelection.png
index 8d39ff69b5..8d39ff69b5 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/75-NativeSelection.png
+++ b/src/com/vaadin/demo/sampler/features/selects/75-NativeSelection.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/75-TwinColumnSelect.png b/src/com/vaadin/demo/sampler/features/selects/75-TwinColumnSelect.png
index b8e0dae88a..b8e0dae88a 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/75-TwinColumnSelect.png
+++ b/src/com/vaadin/demo/sampler/features/selects/75-TwinColumnSelect.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxContains.java
index 0a07130e01..5c6a30a145 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContains.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxContains.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.ComboBox;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.ComboBox;
 
 public class ComboBoxContains extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContainsExample.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxContainsExample.java
index 20fcb0ffe7..57818231fd 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxContainsExample.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxContainsExample.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
-
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.demo.sampler.ExampleUtil;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.AbstractSelect.Filtering;
+package com.vaadin.demo.sampler.features.selects;
+
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.AbstractSelect.Filtering;
 
 public class ComboBoxContainsExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxInputPrompt.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxInputPrompt.java
index 2155f874f9..3021e1761a 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxInputPrompt.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxInputPrompt.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.text.TextFieldInputPrompt;
-import com.itmill.toolkit.ui.ComboBox;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.text.TextFieldInputPrompt;
+import com.vaadin.ui.ComboBox;
 
 public class ComboBoxInputPrompt extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxInputPromptExample.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxInputPromptExample.java
index 4146614659..b326a636de 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxInputPromptExample.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxInputPromptExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.VerticalLayout;
 
 public class ComboBoxInputPromptExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxNewItems.java
index 293adaf76d..1b4508eb19 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItems.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxNewItems.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.ComboBox;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.ComboBox;
 
 public class ComboBoxNewItems extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItemsExample.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxNewItemsExample.java
index f986cb088a..d3c3717195 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxNewItemsExample.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxNewItemsExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.VerticalLayout;
 
 public class ComboBoxNewItemsExample extends VerticalLayout implements
         Property.ValueChangeListener, AbstractSelect.NewItemHandler {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxPlain.java
index b65ed4aab0..18f1ea3a5e 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlain.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxPlain.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.ComboBox;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.ComboBox;
 
 public class ComboBoxPlain extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlainExample.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxPlainExample.java
index d1ef78e0ca..612cc70f59 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxPlainExample.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxPlainExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.AbstractSelect.Filtering;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.AbstractSelect.Filtering;
 
 public class ComboBoxPlainExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxStartsWith.java
index ccabcae411..1f2ca22256 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWith.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxStartsWith.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.ComboBox;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.ComboBox;
 
 public class ComboBoxStartsWith extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWithExample.java b/src/com/vaadin/demo/sampler/features/selects/ComboBoxStartsWithExample.java
index c06df628dc..d29a429890 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ComboBoxStartsWithExample.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ComboBoxStartsWithExample.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
-
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.demo.sampler.ExampleUtil;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.AbstractSelect.Filtering;
+package com.vaadin.demo.sampler.features.selects;
+
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.AbstractSelect.Filtering;
 
 public class ComboBoxStartsWithExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java b/src/com/vaadin/demo/sampler/features/selects/ListSelectMultiple.java
index adb609ce78..5e3f13fff2 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultiple.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ListSelectMultiple.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.ListSelect;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.ListSelect;
 
 public class ListSelectMultiple extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultipleExample.java b/src/com/vaadin/demo/sampler/features/selects/ListSelectMultipleExample.java
index d5c0a7a648..629b1b7326 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectMultipleExample.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ListSelectMultipleExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.ListSelect;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.VerticalLayout;
 
 public class ListSelectMultipleExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java b/src/com/vaadin/demo/sampler/features/selects/ListSelectSingle.java
index bcfc1c4c39..352261a047 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingle.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ListSelectSingle.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.ListSelect;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.ListSelect;
 
 public class ListSelectSingle extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingleExample.java b/src/com/vaadin/demo/sampler/features/selects/ListSelectSingleExample.java
index 78e36d6b0a..90c4ac2a63 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/ListSelectSingleExample.java
+++ b/src/com/vaadin/demo/sampler/features/selects/ListSelectSingleExample.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
 import java.util.Arrays;
 import java.util.List;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.ListSelect;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.VerticalLayout;
 
 public class ListSelectSingleExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java b/src/com/vaadin/demo/sampler/features/selects/NativeSelection.java
index 83cf67e122..95523cddf1 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelection.java
+++ b/src/com/vaadin/demo/sampler/features/selects/NativeSelection.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.NativeSelect;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.NativeSelect;
 
 public class NativeSelection extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelectionExample.java b/src/com/vaadin/demo/sampler/features/selects/NativeSelectionExample.java
index e939272589..63976bfc70 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/NativeSelectionExample.java
+++ b/src/com/vaadin/demo/sampler/features/selects/NativeSelectionExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.VerticalLayout;
 
 public class NativeSelectionExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java b/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelect.java
index 9ce8ae5706..3522a4e8ca 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelect.java
+++ b/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelect.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.TwinColSelect;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.TwinColSelect;
 
 public class TwinColumnSelect extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelectExample.java b/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelectExample.java
index a2a8390ccd..b35a4d60d7 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/selects/TwinColumnSelectExample.java
+++ b/src/com/vaadin/demo/sampler/features/selects/TwinColumnSelectExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.selects;
+package com.vaadin.demo.sampler.features.selects;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.TwinColSelect;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.TwinColSelect;
+import com.vaadin.ui.VerticalLayout;
 
 public class TwinColumnSelectExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableActions.png b/src/com/vaadin/demo/sampler/features/table/75-TableActions.png
index dacd3aea86..dacd3aea86 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableActions.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableActions.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableCellStyling.png b/src/com/vaadin/demo/sampler/features/table/75-TableCellStyling.png
index 798ec20b4f..798ec20b4f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableCellStyling.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableCellStyling.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableColumnAlignment.png b/src/com/vaadin/demo/sampler/features/table/75-TableColumnAlignment.png
index 87d6a18a51..87d6a18a51 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableColumnAlignment.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableColumnAlignment.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableColumnCollapsing.png b/src/com/vaadin/demo/sampler/features/table/75-TableColumnCollapsing.png
index b0922dc00b..b0922dc00b 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableColumnCollapsing.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableColumnCollapsing.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableColumnHeaders.png b/src/com/vaadin/demo/sampler/features/table/75-TableColumnHeaders.png
index b277610f8d..b277610f8d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableColumnHeaders.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableColumnHeaders.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableColumnReordering.png b/src/com/vaadin/demo/sampler/features/table/75-TableColumnReordering.png
index 6c689212cc..6c689212cc 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableColumnReordering.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableColumnReordering.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableHeaderIcons.png b/src/com/vaadin/demo/sampler/features/table/75-TableHeaderIcons.png
index b277610f8d..b277610f8d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableHeaderIcons.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableHeaderIcons.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableLazyLoading.png b/src/com/vaadin/demo/sampler/features/table/75-TableLazyLoading.png
index e5a294cf65..e5a294cf65 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableLazyLoading.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableLazyLoading.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableMouseEvents.png b/src/com/vaadin/demo/sampler/features/table/75-TableMouseEvents.png
index 798ec20b4f..798ec20b4f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableMouseEvents.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableMouseEvents.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableRowHeaders.png b/src/com/vaadin/demo/sampler/features/table/75-TableRowHeaders.png
index b277610f8d..b277610f8d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableRowHeaders.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableRowHeaders.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableRowStyling.png b/src/com/vaadin/demo/sampler/features/table/75-TableRowStyling.png
index f523a049fe..f523a049fe 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableRowStyling.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableRowStyling.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableSorting.png b/src/com/vaadin/demo/sampler/features/table/75-TableSorting.png
index 4014d3aec7..4014d3aec7 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/75-TableSorting.png
+++ b/src/com/vaadin/demo/sampler/features/table/75-TableSorting.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableActions.java b/src/com/vaadin/demo/sampler/features/table/TableActions.java
index ecec28aa50..3c08f9cb75 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableActions.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableActions.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableActions extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableCellStyling.java b/src/com/vaadin/demo/sampler/features/table/TableCellStyling.java
index f511755d43..4dd1a41218 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableCellStyling.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableCellStyling.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableCellStyling extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnAlignment.java b/src/com/vaadin/demo/sampler/features/table/TableColumnAlignment.java
index cf6ad57fca..5ede6a9de5 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnAlignment.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableColumnAlignment.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableColumnAlignment extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnCollapsing.java b/src/com/vaadin/demo/sampler/features/table/TableColumnCollapsing.java
index ad3d8fbf4c..fdc21f8620 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnCollapsing.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableColumnCollapsing.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableColumnCollapsing extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnHeaders.java b/src/com/vaadin/demo/sampler/features/table/TableColumnHeaders.java
index 583f86c79c..aa4dc85ddd 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnHeaders.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableColumnHeaders.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableColumnHeaders extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnReordering.java b/src/com/vaadin/demo/sampler/features/table/TableColumnReordering.java
index 9db6e7f669..7b01fedc78 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableColumnReordering.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableColumnReordering.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableColumnReordering extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableHeaderIcons.java b/src/com/vaadin/demo/sampler/features/table/TableHeaderIcons.java
index c891eed643..df12a44097 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableHeaderIcons.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableHeaderIcons.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableHeaderIcons extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableLazyLoading.java b/src/com/vaadin/demo/sampler/features/table/TableLazyLoading.java
index d4fcebd297..a800451258 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableLazyLoading.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableLazyLoading.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableLazyLoading extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableMainFeaturesExample.java b/src/com/vaadin/demo/sampler/features/table/TableMainFeaturesExample.java
index 860467fbba..3629f9e9ae 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableMainFeaturesExample.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableMainFeaturesExample.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.demo.sampler.features.table;
+package com.vaadin.demo.sampler.features.table;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.demo.sampler.ExampleUtil;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Table.CellStyleGenerator;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.event.Action;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Table.CellStyleGenerator;
 
 public class TableMainFeaturesExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableMouseEvents.java b/src/com/vaadin/demo/sampler/features/table/TableMouseEvents.java
index 57e1d93072..8cc57641aa 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableMouseEvents.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableMouseEvents.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableMouseEvents extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableRowHeaders.java b/src/com/vaadin/demo/sampler/features/table/TableRowHeaders.java
index 467510aa41..1eb98dc871 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableRowHeaders.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableRowHeaders.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableRowHeaders extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableRowStyling.java b/src/com/vaadin/demo/sampler/features/table/TableRowStyling.java
index aa461e7e05..af022f9813 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableRowStyling.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableRowStyling.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableRowStyling extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableSorting.java b/src/com/vaadin/demo/sampler/features/table/TableSorting.java
index cd9d83726b..a812b9cf75 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableSorting.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableSorting.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.table;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.demo.sampler.features.table;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class TableSorting extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/table/TableStylingExample.java b/src/com/vaadin/demo/sampler/features/table/TableStylingExample.java
index fe3cc97c14..afcd565ff7 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/table/TableStylingExample.java
+++ b/src/com/vaadin/demo/sampler/features/table/TableStylingExample.java
@@ -1,21 +1,21 @@
-package com.itmill.toolkit.demo.sampler.features.table;
+package com.vaadin.demo.sampler.features.table;
 
 import java.util.HashMap;
 import java.util.HashSet;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.demo.sampler.ExampleUtil;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.event.ItemClickEvent;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickListener;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Table.CellStyleGenerator;
+import com.vaadin.data.Item;
+import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.event.Action;
+import com.vaadin.event.ItemClickEvent;
+import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Table.CellStyleGenerator;
 
 public class TableStylingExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/75-TabSheetDisabled.png b/src/com/vaadin/demo/sampler/features/tabsheets/75-TabSheetDisabled.png
index ce99368151..ce99368151 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/75-TabSheetDisabled.png
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/75-TabSheetDisabled.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/75-TabSheetIcons.png b/src/com/vaadin/demo/sampler/features/tabsheets/75-TabSheetIcons.png
index d7420ddc35..d7420ddc35 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/75-TabSheetIcons.png
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/75-TabSheetIcons.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/75-TabSheetScrolling.png b/src/com/vaadin/demo/sampler/features/tabsheets/75-TabSheetScrolling.png
index b62e084a9c..b62e084a9c 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/75-TabSheetScrolling.png
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/75-TabSheetScrolling.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabled.java b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetDisabled.java
index dc15ee2c0b..ad8a52cc83 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabled.java
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetDisabled.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.tabsheets;
+package com.vaadin.demo.sampler.features.tabsheets;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.TabSheet;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.TabSheet;
 
 public class TabSheetDisabled extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabledExample.java b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetDisabledExample.java
index 13c292772e..1491e57e85 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetDisabledExample.java
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetDisabledExample.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.demo.sampler.features.tabsheets;
+package com.vaadin.demo.sampler.features.tabsheets;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
-import com.itmill.toolkit.ui.TabSheet.Tab;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
+import com.vaadin.ui.TabSheet.Tab;
 
 public class TabSheetDisabledExample extends VerticalLayout implements
         TabSheet.SelectedTabChangeListener, Button.ClickListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetIcons.java b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetIcons.java
index 80a32fed59..aa7a1d180c 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetIcons.java
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetIcons.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.tabsheets;
+package com.vaadin.demo.sampler.features.tabsheets;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.TabSheet;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.TabSheet;
 
 public class TabSheetIcons extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetIconsExample.java b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetIconsExample.java
index 6d52fb3b35..5bbe5e8835 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetIconsExample.java
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetIconsExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.tabsheets;
+package com.vaadin.demo.sampler.features.tabsheets;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
 
 public class TabSheetIconsExample extends VerticalLayout implements
         TabSheet.SelectedTabChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrolling.java b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetScrolling.java
index 018c2eaf83..6fcae06bc2 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrolling.java
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetScrolling.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.tabsheets;
+package com.vaadin.demo.sampler.features.tabsheets;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.TabSheet;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.TabSheet;
 
 public class TabSheetScrolling extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrollingExample.java b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetScrollingExample.java
index 15c4d0ce8e..f5e3627f10 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/tabsheets/TabSheetScrollingExample.java
+++ b/src/com/vaadin/demo/sampler/features/tabsheets/TabSheetScrollingExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.tabsheets;
+package com.vaadin.demo.sampler.features.tabsheets;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
 
 public class TabSheetScrollingExample extends VerticalLayout implements
         TabSheet.SelectedTabChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/75-LabelPlain.png b/src/com/vaadin/demo/sampler/features/text/75-LabelPlain.png
index 73393d2f3c..73393d2f3c 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/75-LabelPlain.png
+++ b/src/com/vaadin/demo/sampler/features/text/75-LabelPlain.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/75-LabelPreformatted.png b/src/com/vaadin/demo/sampler/features/text/75-LabelPreformatted.png
index 70dd443db9..70dd443db9 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/75-LabelPreformatted.png
+++ b/src/com/vaadin/demo/sampler/features/text/75-LabelPreformatted.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/75-LabelRich.png b/src/com/vaadin/demo/sampler/features/text/75-LabelRich.png
index 8b8689dc02..8b8689dc02 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/75-LabelRich.png
+++ b/src/com/vaadin/demo/sampler/features/text/75-LabelRich.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/75-RichTextEditor.png b/src/com/vaadin/demo/sampler/features/text/75-RichTextEditor.png
index 022724b571..022724b571 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/75-RichTextEditor.png
+++ b/src/com/vaadin/demo/sampler/features/text/75-RichTextEditor.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/75-TextArea.png b/src/com/vaadin/demo/sampler/features/text/75-TextArea.png
index 72497f104c..72497f104c 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/75-TextArea.png
+++ b/src/com/vaadin/demo/sampler/features/text/75-TextArea.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/75-TextFieldInputPrompt.png b/src/com/vaadin/demo/sampler/features/text/75-TextFieldInputPrompt.png
index dc7fbb38f9..dc7fbb38f9 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/75-TextFieldInputPrompt.png
+++ b/src/com/vaadin/demo/sampler/features/text/75-TextFieldInputPrompt.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/75-TextFieldSecret.png b/src/com/vaadin/demo/sampler/features/text/75-TextFieldSecret.png
index 929c79e05a..929c79e05a 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/75-TextFieldSecret.png
+++ b/src/com/vaadin/demo/sampler/features/text/75-TextFieldSecret.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/75-TextFieldSingle.png b/src/com/vaadin/demo/sampler/features/text/75-TextFieldSingle.png
index 5df731e6d3..5df731e6d3 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/75-TextFieldSingle.png
+++ b/src/com/vaadin/demo/sampler/features/text/75-TextFieldSingle.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPlain.java b/src/com/vaadin/demo/sampler/features/text/LabelPlain.java
index cd0181636e..b30dc69005 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPlain.java
+++ b/src/com/vaadin/demo/sampler/features/text/LabelPlain.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Label;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Label;
 
 public class LabelPlain extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPlainExample.java b/src/com/vaadin/demo/sampler/features/text/LabelPlainExample.java
index 7d2ce6c3ce..f96df7af68 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPlainExample.java
+++ b/src/com/vaadin/demo/sampler/features/text/LabelPlainExample.java
@@ -1,7 +1,7 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
 
 public class LabelPlainExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPreformatted.java b/src/com/vaadin/demo/sampler/features/text/LabelPreformatted.java
index e3aed6b1d8..339a251583 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPreformatted.java
+++ b/src/com/vaadin/demo/sampler/features/text/LabelPreformatted.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Label;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Label;
 
 public class LabelPreformatted extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPreformattedExample.java b/src/com/vaadin/demo/sampler/features/text/LabelPreformattedExample.java
index 2794982c89..f9dfb597ed 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/LabelPreformattedExample.java
+++ b/src/com/vaadin/demo/sampler/features/text/LabelPreformattedExample.java
@@ -1,7 +1,7 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
 
 public class LabelPreformattedExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/LabelRich.java b/src/com/vaadin/demo/sampler/features/text/LabelRich.java
index 203d0064ac..40ac46f175 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/LabelRich.java
+++ b/src/com/vaadin/demo/sampler/features/text/LabelRich.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Label;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Label;
 
 public class LabelRich extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/LabelRichExample.java b/src/com/vaadin/demo/sampler/features/text/LabelRichExample.java
index aee62182a6..289e916a8d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/LabelRichExample.java
+++ b/src/com/vaadin/demo/sampler/features/text/LabelRichExample.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.text;
-
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.demo.sampler.features.text;
+
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class LabelRichExample extends VerticalLayout implements ClickListener {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/RichTextEditor.java b/src/com/vaadin/demo/sampler/features/text/RichTextEditor.java
index 62eed31858..2ef5661329 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/RichTextEditor.java
+++ b/src/com/vaadin/demo/sampler/features/text/RichTextEditor.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.RichTextArea;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.RichTextArea;
 
 public class RichTextEditor extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextArea.java b/src/com/vaadin/demo/sampler/features/text/TextArea.java
index 4982e8de5f..3bb731e4d3 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/TextArea.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextArea.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.TextField;
 
 public class TextArea extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextAreaExample.java b/src/com/vaadin/demo/sampler/features/text/TextAreaExample.java
index fbf9e15c53..c6ca5fe181 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/TextAreaExample.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextAreaExample.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.text;
-
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
+package com.vaadin.demo.sampler.features.text;
+
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
 
 public class TextAreaExample extends HorizontalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldInputPrompt.java b/src/com/vaadin/demo/sampler/features/text/TextFieldInputPrompt.java
index 5299916e31..a7da1c61d7 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldInputPrompt.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextFieldInputPrompt.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxInputPrompt;
-import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxNewItems;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.selects.ComboBoxInputPrompt;
+import com.vaadin.demo.sampler.features.selects.ComboBoxNewItems;
+import com.vaadin.ui.TextField;
 
 public class TextFieldInputPrompt extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldInputPromptExample.java b/src/com/vaadin/demo/sampler/features/text/TextFieldInputPromptExample.java
index 19f995044a..9f3d40b445 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldInputPromptExample.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextFieldInputPromptExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
 
 public class TextFieldInputPromptExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecret.java b/src/com/vaadin/demo/sampler/features/text/TextFieldSecret.java
index d743ed0648..b40daafedc 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecret.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextFieldSecret.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxNewItems;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.selects.ComboBoxNewItems;
+import com.vaadin.ui.TextField;
 
 public class TextFieldSecret extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecretExample.java b/src/com/vaadin/demo/sampler/features/text/TextFieldSecretExample.java
index 51f5c9ec8f..f0fee03346 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSecretExample.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextFieldSecretExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TextFieldSecretExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingle.java b/src/com/vaadin/demo/sampler/features/text/TextFieldSingle.java
index a10b53a4aa..15aa90de1c 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingle.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextFieldSingle.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.features.selects.ComboBoxNewItems;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.features.selects.ComboBoxNewItems;
+import com.vaadin.ui.TextField;
 
 public class TextFieldSingle extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingleExample.java b/src/com/vaadin/demo/sampler/features/text/TextFieldSingleExample.java
index 2639becc29..53b20db7ed 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/text/TextFieldSingleExample.java
+++ b/src/com/vaadin/demo/sampler/features/text/TextFieldSingleExample.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.text;
+package com.vaadin.demo.sampler.features.text;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
 
 public class TextFieldSingleExample extends VerticalLayout implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/75-TreeActions.png b/src/com/vaadin/demo/sampler/features/trees/75-TreeActions.png
index 7b68dee674..7b68dee674 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/trees/75-TreeActions.png
+++ b/src/com/vaadin/demo/sampler/features/trees/75-TreeActions.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/75-TreeMouseEvents.png b/src/com/vaadin/demo/sampler/features/trees/75-TreeMouseEvents.png
index 3f22f288d1..3f22f288d1 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/trees/75-TreeMouseEvents.png
+++ b/src/com/vaadin/demo/sampler/features/trees/75-TreeMouseEvents.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/75-TreeMultiSelect.png b/src/com/vaadin/demo/sampler/features/trees/75-TreeMultiSelect.png
index 3b0b250c90..3b0b250c90 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/trees/75-TreeMultiSelect.png
+++ b/src/com/vaadin/demo/sampler/features/trees/75-TreeMultiSelect.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/75-TreeSingleSelect.png b/src/com/vaadin/demo/sampler/features/trees/75-TreeSingleSelect.png
index 03ef1eae76..03ef1eae76 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/trees/75-TreeSingleSelect.png
+++ b/src/com/vaadin/demo/sampler/features/trees/75-TreeSingleSelect.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeActions.java b/src/com/vaadin/demo/sampler/features/trees/TreeActions.java
index 6cf69fe5a0..3d270e265f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeActions.java
+++ b/src/com/vaadin/demo/sampler/features/trees/TreeActions.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.trees;
+package com.vaadin.demo.sampler.features.trees;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Tree;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Tree;
 
 public class TreeActions extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMouseEvents.java b/src/com/vaadin/demo/sampler/features/trees/TreeMouseEvents.java
index 220cbea4d6..261f72112f 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMouseEvents.java
+++ b/src/com/vaadin/demo/sampler/features/trees/TreeMouseEvents.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.trees;
+package com.vaadin.demo.sampler.features.trees;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Tree;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Tree;
 
 public class TreeMouseEvents extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMouseEventsExample.java b/src/com/vaadin/demo/sampler/features/trees/TreeMouseEventsExample.java
index 42cd0117ab..48d560447d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMouseEventsExample.java
+++ b/src/com/vaadin/demo/sampler/features/trees/TreeMouseEventsExample.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.features.trees;
+package com.vaadin.demo.sampler.features.trees;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.demo.sampler.ExampleUtil;
-import com.itmill.toolkit.event.ItemClickEvent;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickListener;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Item;
+import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.event.ItemClickEvent;
+import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.VerticalLayout;
 
 public class TreeMouseEventsExample extends VerticalLayout implements
         ItemClickListener {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelect.java b/src/com/vaadin/demo/sampler/features/trees/TreeMultiSelect.java
index 47ea3cff25..c83729b29b 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelect.java
+++ b/src/com/vaadin/demo/sampler/features/trees/TreeMultiSelect.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.trees;
+package com.vaadin.demo.sampler.features.trees;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Tree;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Tree;
 
 public class TreeMultiSelect extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelectExample.java b/src/com/vaadin/demo/sampler/features/trees/TreeMultiSelectExample.java
index 5d421b4d91..e97111ad85 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeMultiSelectExample.java
+++ b/src/com/vaadin/demo/sampler/features/trees/TreeMultiSelectExample.java
@@ -1,18 +1,18 @@
-package com.itmill.toolkit.demo.sampler.features.trees;
+package com.vaadin.demo.sampler.features.trees;
 
 import java.util.Iterator;
 import java.util.Set;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.demo.sampler.ExampleUtil;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.event.Action;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TreeMultiSelectExample extends VerticalLayout implements
         Action.Handler {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeSingleSelect.java b/src/com/vaadin/demo/sampler/features/trees/TreeSingleSelect.java
index 2197835b43..d25950cdbc 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeSingleSelect.java
+++ b/src/com/vaadin/demo/sampler/features/trees/TreeSingleSelect.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.features.trees;
+package com.vaadin.demo.sampler.features.trees;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Tree;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Tree;
 
 public class TreeSingleSelect extends Feature {
     @Override
diff --git a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeSingleSelectExample.java b/src/com/vaadin/demo/sampler/features/trees/TreeSingleSelectExample.java
index 5d1aa6767b..0bbeacf921 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/trees/TreeSingleSelectExample.java
+++ b/src/com/vaadin/demo/sampler/features/trees/TreeSingleSelectExample.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.demo.sampler.features.trees;
-
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.demo.sampler.ExampleUtil;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.demo.sampler.features.trees;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.demo.sampler.ExampleUtil;
+import com.vaadin.event.Action;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TreeSingleSelectExample extends HorizontalLayout implements
         Property.ValueChangeListener, Button.ClickListener, Action.Handler {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/75-NativeWindow.png b/src/com/vaadin/demo/sampler/features/windows/75-NativeWindow.png
index 14981b1836..14981b1836 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/75-NativeWindow.png
+++ b/src/com/vaadin/demo/sampler/features/windows/75-NativeWindow.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/75-Subwindow.png b/src/com/vaadin/demo/sampler/features/windows/75-Subwindow.png
index bd92cc04e8..bd92cc04e8 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/75-Subwindow.png
+++ b/src/com/vaadin/demo/sampler/features/windows/75-Subwindow.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/75-SubwindowAutoSized.png b/src/com/vaadin/demo/sampler/features/windows/75-SubwindowAutoSized.png
index 2752d2f581..2752d2f581 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/75-SubwindowAutoSized.png
+++ b/src/com/vaadin/demo/sampler/features/windows/75-SubwindowAutoSized.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/75-SubwindowClose.png b/src/com/vaadin/demo/sampler/features/windows/75-SubwindowClose.png
index a76e9ba0b2..a76e9ba0b2 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/75-SubwindowClose.png
+++ b/src/com/vaadin/demo/sampler/features/windows/75-SubwindowClose.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/75-SubwindowModal.png b/src/com/vaadin/demo/sampler/features/windows/75-SubwindowModal.png
index 0eb9cfe0fd..0eb9cfe0fd 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/75-SubwindowModal.png
+++ b/src/com/vaadin/demo/sampler/features/windows/75-SubwindowModal.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/75-SubwindowPositioned.png b/src/com/vaadin/demo/sampler/features/windows/75-SubwindowPositioned.png
index c3e0d5f0a3..c3e0d5f0a3 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/75-SubwindowPositioned.png
+++ b/src/com/vaadin/demo/sampler/features/windows/75-SubwindowPositioned.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/75-SubwindowSized.png b/src/com/vaadin/demo/sampler/features/windows/75-SubwindowSized.png
index c918d84063..c918d84063 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/75-SubwindowSized.png
+++ b/src/com/vaadin/demo/sampler/features/windows/75-SubwindowSized.png
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/NativeWindow.java b/src/com/vaadin/demo/sampler/features/windows/NativeWindow.java
index 6b955192d0..0d030945b5 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/NativeWindow.java
+++ b/src/com/vaadin/demo/sampler/features/windows/NativeWindow.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
-
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.demo.sampler.FeatureSet.Links;
-import com.itmill.toolkit.demo.sampler.FeatureSet.Windows;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.demo.sampler.features.windows;
+
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.demo.sampler.FeatureSet.Links;
+import com.vaadin.demo.sampler.FeatureSet.Windows;
+import com.vaadin.ui.Window;
 
 public class NativeWindow extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/NativeWindowExample.java b/src/com/vaadin/demo/sampler/features/windows/NativeWindowExample.java
index 43cdfdcc18..b1b2933f1d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/NativeWindowExample.java
+++ b/src/com/vaadin/demo/sampler/features/windows/NativeWindowExample.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
 import java.util.Date;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class NativeWindowExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/Subwindow.java b/src/com/vaadin/demo/sampler/features/windows/Subwindow.java
index b19eb42b3e..aa7d1f48c4 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/Subwindow.java
+++ b/src/com/vaadin/demo/sampler/features/windows/Subwindow.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Window;
 
 public class Subwindow extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowAutoSized.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowAutoSized.java
index c3cc0ac636..1b8b5e32cd 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowAutoSized.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowAutoSized.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Window;
 
 public class SubwindowAutoSized extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowAutoSizedExample.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowAutoSizedExample.java
index cf7515d38b..e2f0a60e3d 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowAutoSizedExample.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowAutoSizedExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class SubwindowAutoSizedExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowClose.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowClose.java
index 59bb6e3df1..6c572bd20c 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowClose.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowClose.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Window;
 
 public class SubwindowClose extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowCloseExample.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowCloseExample.java
index 7543af2c4a..2b0f0073c0 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowCloseExample.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowCloseExample.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
-
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.CloseEvent;
+package com.vaadin.demo.sampler.features.windows;
+
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.CloseEvent;
 
 public class SubwindowCloseExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowExample.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowExample.java
index 8702171055..cb48201acc 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowExample.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class SubwindowExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowModal.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowModal.java
index ac57b9fded..28c93c1ae0 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowModal.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowModal.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Window;
 
 public class SubwindowModal extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowModalExample.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowModalExample.java
index 279c7851f8..15ee9f040a 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowModalExample.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowModalExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class SubwindowModalExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowPositioned.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowPositioned.java
index 564319cada..3da56d87bc 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowPositioned.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowPositioned.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Window;
 
 public class SubwindowPositioned extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowPositionedExample.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowPositionedExample.java
index 4a9e02d7b5..f50bf0a21b 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowPositionedExample.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowPositionedExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class SubwindowPositionedExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowSized.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowSized.java
index 90ec8a82a6..ad03155d30 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowSized.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowSized.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
-import com.itmill.toolkit.demo.sampler.APIResource;
-import com.itmill.toolkit.demo.sampler.Feature;
-import com.itmill.toolkit.demo.sampler.FeatureSet;
-import com.itmill.toolkit.demo.sampler.NamedExternalResource;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.demo.sampler.APIResource;
+import com.vaadin.demo.sampler.Feature;
+import com.vaadin.demo.sampler.FeatureSet;
+import com.vaadin.demo.sampler.NamedExternalResource;
+import com.vaadin.ui.Window;
 
 public class SubwindowSized extends Feature {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowSizedExample.java b/src/com/vaadin/demo/sampler/features/windows/SubwindowSizedExample.java
index 6c5485bb02..93703773e2 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/windows/SubwindowSizedExample.java
+++ b/src/com/vaadin/demo/sampler/features/windows/SubwindowSizedExample.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.sampler.features.windows;
+package com.vaadin.demo.sampler.features.windows;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class SubwindowSizedExample extends VerticalLayout {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/folder.gif b/src/com/vaadin/demo/sampler/folder.gif
index 8dc04c4956..8dc04c4956 100644
--- a/src/com/itmill/toolkit/demo/sampler/folder.gif
+++ b/src/com/vaadin/demo/sampler/folder.gif
diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/SamplerWidgetSet.gwt.xml b/src/com/vaadin/demo/sampler/gwt/SamplerWidgetSet.gwt.xml
index 2b89a0cd3e..dc6d1b206c 100644
--- a/src/com/itmill/toolkit/demo/sampler/gwt/SamplerWidgetSet.gwt.xml
+++ b/src/com/vaadin/demo/sampler/gwt/SamplerWidgetSet.gwt.xml
@@ -1,6 +1,6 @@
 <module>
 	<!-- Inherit the DefaultWidgetSet -->
-	<inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSet" /> 
+	<inherits name="com.vaadin.terminal.gwt.DefaultWidgetSet" /> 
 	
 	<!-- Tracker -->
 	<script src="http://www.google-analytics.com/ga.js" />
@@ -10,6 +10,6 @@
 	<script src="prettify/prettify.js" />
 
 	<!-- Entry point -->
-	<entry-point class="com.itmill.toolkit.demo.sampler.gwt.client.SamplerWidgetSet"/>
+	<entry-point class="com.vaadin.demo.sampler.gwt.client.SamplerWidgetSet"/>
   
 </module>
diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/client/SamplerWidgetSet.java b/src/com/vaadin/demo/sampler/gwt/client/SamplerWidgetSet.java
index 96bcc35ebd..2738b21990 100644
--- a/src/com/itmill/toolkit/demo/sampler/gwt/client/SamplerWidgetSet.java
+++ b/src/com/vaadin/demo/sampler/gwt/client/SamplerWidgetSet.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.gwt.client;
+package com.vaadin.demo.sampler.gwt.client;
 
-import com.itmill.toolkit.demo.sampler.gwt.client.ui.IActiveLink;
-import com.itmill.toolkit.demo.sampler.gwt.client.ui.ICodeLabel;
-import com.itmill.toolkit.demo.sampler.gwt.client.ui.IGoogleAnalytics;
-import com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.demo.sampler.gwt.client.ui.IActiveLink;
+import com.vaadin.demo.sampler.gwt.client.ui.ICodeLabel;
+import com.vaadin.demo.sampler.gwt.client.ui.IGoogleAnalytics;
+import com.vaadin.terminal.gwt.client.DefaultWidgetSet;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class SamplerWidgetSet extends DefaultWidgetSet {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IActiveLink.java b/src/com/vaadin/demo/sampler/gwt/client/ui/IActiveLink.java
index b292c38bce..d539ef5611 100644
--- a/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IActiveLink.java
+++ b/src/com/vaadin/demo/sampler/gwt/client/ui/IActiveLink.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.sampler.gwt.client.ui;
+package com.vaadin.demo.sampler.gwt.client.ui;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.MouseListener;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.ui.ILink;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ui.ILink;
 
 public class IActiveLink extends ILink {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/ICodeLabel.java b/src/com/vaadin/demo/sampler/gwt/client/ui/ICodeLabel.java
index ace6e3558b..a97d74e067 100644
--- a/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/ICodeLabel.java
+++ b/src/com/vaadin/demo/sampler/gwt/client/ui/ICodeLabel.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.sampler.gwt.client.ui;
+package com.vaadin.demo.sampler.gwt.client.ui;
 
 import com.google.gwt.dom.client.Element;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.ui.ILabel;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ui.ILabel;
 
 public class ICodeLabel extends ILabel {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IGoogleAnalytics.java b/src/com/vaadin/demo/sampler/gwt/client/ui/IGoogleAnalytics.java
index fcd3574e64..13e15fb32c 100644
--- a/src/com/itmill/toolkit/demo/sampler/gwt/client/ui/IGoogleAnalytics.java
+++ b/src/com/vaadin/demo/sampler/gwt/client/ui/IGoogleAnalytics.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.demo.sampler.gwt.client.ui;
+package com.vaadin.demo.sampler.gwt.client.ui;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+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.UIDL;
 
 public class IGoogleAnalytics extends Widget implements Paintable {
 
diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/public/prettify/README.txt b/src/com/vaadin/demo/sampler/gwt/public/prettify/README.txt
index e39bfb78fc..e39bfb78fc 100644
--- a/src/com/itmill/toolkit/demo/sampler/gwt/public/prettify/README.txt
+++ b/src/com/vaadin/demo/sampler/gwt/public/prettify/README.txt
diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/public/prettify/prettify.css b/src/com/vaadin/demo/sampler/gwt/public/prettify/prettify.css
index 647fc61472..647fc61472 100644
--- a/src/com/itmill/toolkit/demo/sampler/gwt/public/prettify/prettify.css
+++ b/src/com/vaadin/demo/sampler/gwt/public/prettify/prettify.css
diff --git a/src/com/itmill/toolkit/demo/sampler/gwt/public/prettify/prettify.js b/src/com/vaadin/demo/sampler/gwt/public/prettify/prettify.js
index f8f4f7f461..f8f4f7f461 100644
--- a/src/com/itmill/toolkit/demo/sampler/gwt/public/prettify/prettify.js
+++ b/src/com/vaadin/demo/sampler/gwt/public/prettify/prettify.js
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/AddressBookApplication.java b/src/com/vaadin/demo/tutorial/addressbook/AddressBookApplication.java
index b2c38170d6..ad61246c22 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/AddressBookApplication.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/AddressBookApplication.java
@@ -2,36 +2,36 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.tutorial.addressbook;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.demo.tutorial.addressbook.data.PersonContainer;
-import com.itmill.toolkit.demo.tutorial.addressbook.data.SearchFilter;
-import com.itmill.toolkit.demo.tutorial.addressbook.ui.HelpWindow;
-import com.itmill.toolkit.demo.tutorial.addressbook.ui.ListView;
-import com.itmill.toolkit.demo.tutorial.addressbook.ui.NavigationTree;
-import com.itmill.toolkit.demo.tutorial.addressbook.ui.PersonForm;
-import com.itmill.toolkit.demo.tutorial.addressbook.ui.PersonList;
-import com.itmill.toolkit.demo.tutorial.addressbook.ui.SearchView;
-import com.itmill.toolkit.demo.tutorial.addressbook.ui.SharingOptions;
-import com.itmill.toolkit.event.ItemClickEvent;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickListener;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
-import com.itmill.toolkit.ui.Window.Notification;
+package com.vaadin.demo.tutorial.addressbook;
+
+import com.vaadin.Application;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.demo.tutorial.addressbook.data.PersonContainer;
+import com.vaadin.demo.tutorial.addressbook.data.SearchFilter;
+import com.vaadin.demo.tutorial.addressbook.ui.HelpWindow;
+import com.vaadin.demo.tutorial.addressbook.ui.ListView;
+import com.vaadin.demo.tutorial.addressbook.ui.NavigationTree;
+import com.vaadin.demo.tutorial.addressbook.ui.PersonForm;
+import com.vaadin.demo.tutorial.addressbook.ui.PersonList;
+import com.vaadin.demo.tutorial.addressbook.ui.SearchView;
+import com.vaadin.demo.tutorial.addressbook.ui.SharingOptions;
+import com.vaadin.event.ItemClickEvent;
+import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Window.Notification;
 
 public class AddressBookApplication extends Application implements
 		ClickListener, ValueChangeListener, ItemClickListener {
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/data/Person.java b/src/com/vaadin/demo/tutorial/addressbook/data/Person.java
index 80ed848205..772f3e143a 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/data/Person.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/data/Person.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.data;
+package com.vaadin.demo.tutorial.addressbook.data;
 
 import java.io.Serializable;
 
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/data/PersonContainer.java b/src/com/vaadin/demo/tutorial/addressbook/data/PersonContainer.java
index 3c84ac4764..d0dfb262bf 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/data/PersonContainer.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/data/PersonContainer.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.data;
+package com.vaadin.demo.tutorial.addressbook.data;
 
 import java.io.Serializable;
 import java.util.Random;
 
-import com.itmill.toolkit.data.util.BeanItemContainer;
+import com.vaadin.data.util.BeanItemContainer;
 
 public class PersonContainer extends BeanItemContainer<Person> implements
         Serializable {
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/data/SearchFilter.java b/src/com/vaadin/demo/tutorial/addressbook/data/SearchFilter.java
index 1ebd9fa372..fd7eb16ae9 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/data/SearchFilter.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/data/SearchFilter.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.data;
+package com.vaadin.demo.tutorial.addressbook.data;
 
 import java.io.Serializable;
 
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/HelpWindow.java b/src/com/vaadin/demo/tutorial/addressbook/ui/HelpWindow.java
index d5c08721d4..17a553aadc 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/HelpWindow.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/HelpWindow.java
@@ -1,7 +1,7 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.ui;
+package com.vaadin.demo.tutorial.addressbook.ui;
 
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 public class HelpWindow extends Window {
 	private static final String HELP_HTML_SNIPPET = "This is "
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/ListView.java b/src/com/vaadin/demo/tutorial/addressbook/ui/ListView.java
index 4f5425d39d..4790e0ed3e 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/ListView.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/ListView.java
@@ -1,6 +1,6 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.ui;
+package com.vaadin.demo.tutorial.addressbook.ui;
 
-import com.itmill.toolkit.ui.SplitPanel;
+import com.vaadin.ui.SplitPanel;
 
 public class ListView extends SplitPanel {
 	public ListView(PersonList personList, PersonForm personForm) {
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/NavigationTree.java b/src/com/vaadin/demo/tutorial/addressbook/ui/NavigationTree.java
index c44d27b9ca..f95c938beb 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/NavigationTree.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/NavigationTree.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.ui;
+package com.vaadin.demo.tutorial.addressbook.ui;
 
-import com.itmill.toolkit.demo.tutorial.addressbook.AddressBookApplication;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickListener;
-import com.itmill.toolkit.ui.Tree;
+import com.vaadin.demo.tutorial.addressbook.AddressBookApplication;
+import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.ui.Tree;
 
 public class NavigationTree extends Tree {
 	public static final Object SHOW_ALL = "Show all";
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/PersonForm.java b/src/com/vaadin/demo/tutorial/addressbook/ui/PersonForm.java
index f7f9e0aa77..212c921ed0 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/PersonForm.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/PersonForm.java
@@ -1,26 +1,26 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.ui;
+package com.vaadin.demo.tutorial.addressbook.ui;
 
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.demo.tutorial.addressbook.AddressBookApplication;
-import com.itmill.toolkit.demo.tutorial.addressbook.data.Person;
-import com.itmill.toolkit.demo.tutorial.addressbook.data.PersonContainer;
-import com.itmill.toolkit.demo.tutorial.addressbook.validators.EmailValidator;
-import com.itmill.toolkit.demo.tutorial.addressbook.validators.PostalCodeValidator;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.demo.tutorial.addressbook.AddressBookApplication;
+import com.vaadin.demo.tutorial.addressbook.data.Person;
+import com.vaadin.demo.tutorial.addressbook.data.PersonContainer;
+import com.vaadin.demo.tutorial.addressbook.validators.EmailValidator;
+import com.vaadin.demo.tutorial.addressbook.validators.PostalCodeValidator;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class PersonForm extends Form implements ClickListener {
 
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/PersonList.java b/src/com/vaadin/demo/tutorial/addressbook/ui/PersonList.java
index 12007683be..f1bd945c38 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/PersonList.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/PersonList.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.ui;
+package com.vaadin.demo.tutorial.addressbook.ui;
 
-import com.itmill.toolkit.demo.tutorial.addressbook.AddressBookApplication;
-import com.itmill.toolkit.demo.tutorial.addressbook.data.Person;
-import com.itmill.toolkit.demo.tutorial.addressbook.data.PersonContainer;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.demo.tutorial.addressbook.AddressBookApplication;
+import com.vaadin.demo.tutorial.addressbook.data.Person;
+import com.vaadin.demo.tutorial.addressbook.data.PersonContainer;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Table;
 
 public class PersonList extends Table {
 	public PersonList(AddressBookApplication app) {
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/SearchView.java b/src/com/vaadin/demo/tutorial/addressbook/ui/SearchView.java
index 4086c95d73..dcf53b4fa9 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/SearchView.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/SearchView.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.ui;
+package com.vaadin.demo.tutorial.addressbook.ui;
 
-import com.itmill.toolkit.demo.tutorial.addressbook.AddressBookApplication;
-import com.itmill.toolkit.demo.tutorial.addressbook.data.PersonContainer;
-import com.itmill.toolkit.demo.tutorial.addressbook.data.SearchFilter;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.FormLayout;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.demo.tutorial.addressbook.AddressBookApplication;
+import com.vaadin.demo.tutorial.addressbook.data.PersonContainer;
+import com.vaadin.demo.tutorial.addressbook.data.SearchFilter;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Window.Notification;
 
 public class SearchView extends Panel {
 
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/SharingOptions.java b/src/com/vaadin/demo/tutorial/addressbook/ui/SharingOptions.java
index 772247cdfb..8ea22a4c7d 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/ui/SharingOptions.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/ui/SharingOptions.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.ui;
+package com.vaadin.demo.tutorial.addressbook.ui;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class SharingOptions extends Window {
 	public SharingOptions() {
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/validators/EmailValidator.java b/src/com/vaadin/demo/tutorial/addressbook/validators/EmailValidator.java
index 609a216f95..0c3068d976 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/validators/EmailValidator.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/validators/EmailValidator.java
@@ -1,6 +1,6 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.validators;
+package com.vaadin.demo.tutorial.addressbook.validators;
 
-import com.itmill.toolkit.data.Validator;
+import com.vaadin.data.Validator;
 
 public class EmailValidator implements Validator {
 
diff --git a/src/com/itmill/toolkit/demo/tutorial/addressbook/validators/PostalCodeValidator.java b/src/com/vaadin/demo/tutorial/addressbook/validators/PostalCodeValidator.java
index 5558a0d1dd..bd08ab6929 100644
--- a/src/com/itmill/toolkit/demo/tutorial/addressbook/validators/PostalCodeValidator.java
+++ b/src/com/vaadin/demo/tutorial/addressbook/validators/PostalCodeValidator.java
@@ -1,6 +1,6 @@
-package com.itmill.toolkit.demo.tutorial.addressbook.validators;
+package com.vaadin.demo.tutorial.addressbook.validators;
 
-import com.itmill.toolkit.data.Validator;
+import com.vaadin.data.Validator;
 
 public class PostalCodeValidator implements Validator {
 
diff --git a/src/com/itmill/toolkit/demo/util/SampleCalendarDatabase.java b/src/com/vaadin/demo/util/SampleCalendarDatabase.java
index 4797fdfc60..23c39a6e2e 100644
--- a/src/com/itmill/toolkit/demo/util/SampleCalendarDatabase.java
+++ b/src/com/vaadin/demo/util/SampleCalendarDatabase.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.util;
+package com.vaadin.demo.util;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/src/com/itmill/toolkit/demo/util/SampleDatabase.java b/src/com/vaadin/demo/util/SampleDatabase.java
index 7bdebb2502..e9238d95da 100644
--- a/src/com/itmill/toolkit/demo/util/SampleDatabase.java
+++ b/src/com/vaadin/demo/util/SampleDatabase.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.util;
+package com.vaadin.demo.util;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
diff --git a/src/com/itmill/toolkit/demo/util/SampleDirectory.java b/src/com/vaadin/demo/util/SampleDirectory.java
index 2c90f18d3f..2e4c785024 100644
--- a/src/com/itmill/toolkit/demo/util/SampleDirectory.java
+++ b/src/com/vaadin/demo/util/SampleDirectory.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.demo.util;
+package com.vaadin.demo.util;
 
 import java.io.File;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.SystemError;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
+import com.vaadin.Application;
+import com.vaadin.terminal.SystemError;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
 
 /**
  * Provides sample directory based on application directory. If this fails then
diff --git a/src/com/itmill/toolkit/event/Action.java b/src/com/vaadin/event/Action.java
index 3c9074bc94..c3329e6d56 100644
--- a/src/com/itmill/toolkit/event/Action.java
+++ b/src/com/vaadin/event/Action.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.event;
+package com.vaadin.event;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.terminal.Resource;
+import com.vaadin.terminal.Resource;
 
 /**
  * Implements the action framework. This class contains subinterfaces for action
diff --git a/src/com/itmill/toolkit/event/EventRouter.java b/src/com/vaadin/event/EventRouter.java
index 6d802a6fdc..ca98c5e799 100644
--- a/src/com/itmill/toolkit/event/EventRouter.java
+++ b/src/com/vaadin/event/EventRouter.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.event;
+package com.vaadin.event;
 
 import java.lang.reflect.Method;
 import java.util.EventObject;
@@ -13,7 +13,7 @@ import java.util.Set;
 /**
  * <code>EventRouter</code> class implementing the inheritable event listening
  * model. For more information on the event model see the
- * {@link com.itmill.toolkit.event package documentation}.
+ * {@link com.vaadin.event package documentation}.
  * 
  * @author IT Mill Ltd.
  * @version
diff --git a/src/com/itmill/toolkit/event/ItemClickEvent.java b/src/com/vaadin/event/ItemClickEvent.java
index c68bc98788..b69e8e4c92 100644
--- a/src/com/itmill/toolkit/event/ItemClickEvent.java
+++ b/src/com/vaadin/event/ItemClickEvent.java
@@ -1,19 +1,19 @@
-package com.itmill.toolkit.event;
+package com.vaadin.event;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.terminal.gwt.client.MouseEventDetails;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Component.Event;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Component.Event;
 
 /**
  * 
  * Click event fired by a {@link Component} implementing
- * {@link com.itmill.toolkit.data.Container} interface. ItemClickEvents happens
+ * {@link com.vaadin.data.Container} interface. ItemClickEvents happens
  * on an {@link Item} rendered somehow on terminal. Event may also contain a
  * specific {@link Property} on which the click event happened.
  * 
diff --git a/src/com/itmill/toolkit/event/ListenerMethod.java b/src/com/vaadin/event/ListenerMethod.java
index b0732398c7..3efd4c70c7 100644
--- a/src/com/itmill/toolkit/event/ListenerMethod.java
+++ b/src/com/vaadin/event/ListenerMethod.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.event;
+package com.vaadin.event;
 
 import java.io.IOException;
 import java.io.NotSerializableException;
diff --git a/src/com/itmill/toolkit/event/MethodEventSource.java b/src/com/vaadin/event/MethodEventSource.java
index 16aca65208..3fd8ef68be 100644
--- a/src/com/itmill/toolkit/event/MethodEventSource.java
+++ b/src/com/vaadin/event/MethodEventSource.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.event;
+package com.vaadin.event;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -14,7 +14,7 @@ import java.lang.reflect.Method;
  * 
  * <p>
  * For more information on the inheritable event mechanism see the
- * {@link com.itmill.toolkit.event com.itmill.toolkit.event package
+ * {@link com.vaadin.event com.vaadin.event package
  * documentation}.
  * </p>
  * 
@@ -35,7 +35,7 @@ public interface MethodEventSource extends Serializable {
      * 
      * <p>
      * For more information on the inheritable event mechanism see the
-     * {@link com.itmill.toolkit.event com.itmill.toolkit.event package
+     * {@link com.vaadin.event com.vaadin.event package
      * documentation}.
      * </p>
      * 
@@ -69,7 +69,7 @@ public interface MethodEventSource extends Serializable {
      * 
      * <p>
      * For more information on the inheritable event mechanism see the
-     * {@link com.itmill.toolkit.event com.itmill.toolkit.event package
+     * {@link com.vaadin.event com.vaadin.event package
      * documentation}.
      * </p>
      * 
@@ -95,7 +95,7 @@ public interface MethodEventSource extends Serializable {
      * 
      * <p>
      * For more information on the inheritable event mechanism see the
-     * {@link com.itmill.toolkit.event com.itmill.toolkit.event package
+     * {@link com.vaadin.event com.vaadin.event package
      * documentation}.
      * </p>
      * 
@@ -114,7 +114,7 @@ public interface MethodEventSource extends Serializable {
      * 
      * <p>
      * For more information on the inheritable event mechanism see the
-     * {@link com.itmill.toolkit.event com.itmill.toolkit.event package
+     * {@link com.vaadin.event com.vaadin.event package
      * documentation}.
      * </p>
      * 
@@ -145,7 +145,7 @@ public interface MethodEventSource extends Serializable {
      * 
      * <p>
      * For more information on the inheritable event mechanism see the
-     * {@link com.itmill.toolkit.event com.itmill.toolkit.event package
+     * {@link com.vaadin.event com.vaadin.event package
      * documentation}.
      * </p>
      * 
diff --git a/src/com/itmill/toolkit/event/ShortcutAction.java b/src/com/vaadin/event/ShortcutAction.java
index 6090889ada..5b82f51448 100644
--- a/src/com/itmill/toolkit/event/ShortcutAction.java
+++ b/src/com/vaadin/event/ShortcutAction.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.event;
+package com.vaadin.event;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.terminal.Resource;
+import com.vaadin.terminal.Resource;
 
 /**
  * Extends Action class with keyboard bindings. TODO: fix documentation.
diff --git a/src/com/itmill/toolkit/event/package.html b/src/com/vaadin/event/package.html
index 0b82b94989..b44626125d 100644
--- a/src/com/itmill/toolkit/event/package.html
+++ b/src/com/vaadin/event/package.html
@@ -11,13 +11,13 @@
 model. The model supports inheritable events and a flexible way of
 registering and unregistering event listeners. It's a fundamental building
 block of the IT Mill Toolkit, and as it is included in
-{@link com.itmill.toolkit.ui.AbstractComponent}, all UI components
+{@link com.vaadin.ui.AbstractComponent}, all UI components
 automatically support it.</p>
 
 <h2>Package Specification</h2>
 
 <p>The core of the event model is the inheritable event class
-hierarchy, and the {@link com.itmill.toolkit.event.EventRouter EventRouter}
+hierarchy, and the {@link com.vaadin.event.EventRouter EventRouter}
 which provide a simple, ubiquitous mechanism to transport events to all
 interested parties.</p>
 
@@ -42,13 +42,13 @@ object owning the method. From these a new listener is constructed and added
 to the event router of the specified component.</p>
 
 <p>The interface is defined in
-{@link com.itmill.toolkit.event.MethodEventSource MethodEventSource}, and a
+{@link com.vaadin.event.MethodEventSource MethodEventSource}, and a
 straightforward implementation of it is defined in
-{@link com.itmill.toolkit.event.EventRouter EventRouter} which also includes
+{@link com.vaadin.event.EventRouter EventRouter} which also includes
 a method to actually fire the events.</p>
 
 <p>All fired events are passed to all registered listeners, which are of
-type {@link com.itmill.toolkit.event.ListenerMethod ListenerMethod}. The
+type {@link com.vaadin.event.ListenerMethod ListenerMethod}. The
 listener then checks if the event type matches with the specified event
 type and calls the specified trigger method if it does.</p>
 
diff --git a/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java b/src/com/vaadin/launcher/ITMillToolkitDesktopMode.java
index e16fea21cb..4feabeae71 100644
--- a/src/com/itmill/toolkit/launcher/ITMillToolkitDesktopMode.java
+++ b/src/com/vaadin/launcher/ITMillToolkitDesktopMode.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.launcher;
+package com.vaadin.launcher;
 
 import java.awt.FlowLayout;
 import java.awt.HeadlessException;
@@ -26,7 +26,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.WindowConstants;
 
-import com.itmill.toolkit.launcher.util.BrowserLauncher;
+import com.vaadin.launcher.util.BrowserLauncher;
 
 /**
  * This class starts servlet container and opens a simple control dialog.
diff --git a/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java b/src/com/vaadin/launcher/ITMillToolkitWebMode.java
index bf4eb24f68..d7931deb96 100644
--- a/src/com/itmill/toolkit/launcher/ITMillToolkitWebMode.java
+++ b/src/com/vaadin/launcher/ITMillToolkitWebMode.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.launcher;
+package com.vaadin.launcher;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -12,7 +12,7 @@ import org.mortbay.jetty.Server;
 import org.mortbay.jetty.nio.SelectChannelConnector;
 import org.mortbay.jetty.webapp.WebAppContext;
 
-import com.itmill.toolkit.launcher.util.BrowserLauncher;
+import com.vaadin.launcher.util.BrowserLauncher;
 
 /**
  * Class for running Jetty servlet container within Eclipse project.
diff --git a/src/com/itmill/toolkit/launcher/WidgetsetCompiler.java b/src/com/vaadin/launcher/WidgetsetCompiler.java
index 389aacaee3..ecbd270d66 100644
--- a/src/com/itmill/toolkit/launcher/WidgetsetCompiler.java
+++ b/src/com/vaadin/launcher/WidgetsetCompiler.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.launcher;
+package com.vaadin.launcher;
 
 import com.google.gwt.dev.GWTCompiler;
 
@@ -14,7 +14,7 @@ import com.google.gwt.dev.GWTCompiler;
  * 
  * A typical invocation would use e.g. the following arguments
  * 
- * "-out WebContent/ITMILL/widgetsets com.itmill.toolkit.terminal.gwt.DefaultWidgetSet"
+ * "-out WebContent/ITMILL/widgetsets com.vaadin.terminal.gwt.DefaultWidgetSet"
  * 
  * In addition, larger memory usage settings for the VM should be used, e.g.
  * 
diff --git a/src/com/itmill/toolkit/launcher/util/BrowserLauncher.java b/src/com/vaadin/launcher/util/BrowserLauncher.java
index 135ce79b71..7d8d23f028 100644
--- a/src/com/itmill/toolkit/launcher/util/BrowserLauncher.java
+++ b/src/com/vaadin/launcher/util/BrowserLauncher.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.launcher.util;
+package com.vaadin.launcher.util;
 
 import java.io.IOException;
 
diff --git a/src/com/itmill/toolkit/package.html b/src/com/vaadin/package.html
index be8e7fe395..de2b5233b6 100644
--- a/src/com/itmill/toolkit/package.html
+++ b/src/com/vaadin/package.html
@@ -14,21 +14,21 @@ The sub-packages from this point contain application components and utilities.
 
 	<b>IT Mill Toolkit is composed of the following packages:</b>
 	<dl>
-		<dt>com.itmill.toolkit.data</dt>
+		<dt>com.vaadin.data</dt>
 		 <dd>A library of interfaces for transparently binding UI components to datasources.</dd>
-		<dt>com.itmill.toolkit.data.util</dt>
+		<dt>com.vaadin.data.util</dt>
 		 <dd>Basic implementations of data-intfaces and utidtties for working with data-bound components.</dd>
-		<dt>com.itmill.toolkit.data.validator</dt>
+		<dt>com.vaadin.data.validator</dt>
 		 <dd>Classes providing data-validation for Properties.</dd>
-		<dt>com.itmill.toolkit.event</dt>
+		<dt>com.vaadin.event</dt>
 		 <dd>Interfaces defining how to send and recieve events.</dd>
-		<dt>com.itmill.toolkit.service</dt>
+		<dt>com.vaadin.service</dt>
 		 <dd>Classes provding miscelaneous utidtty services.</dd>
-		<dt>com.itmill.toolkit.terminal</dt>
+		<dt>com.vaadin.terminal</dt>
 		 <dd>Classes and interfaces for implementing the terminal specific adapters.</dd>
-		<dt>com.itmill.toolkit.terminal.web</dt>
+		<dt>com.vaadin.terminal.web</dt>
 		 <dd>Classes that implement support both for AJAX-based and more limited web browsers.</dd>
-		<dt>com.itmill.toolkit.ui</dt>
+		<dt>com.vaadin.ui</dt>
 		 <dd>UI components.</dd>
 	</dl>
 
diff --git a/src/com/itmill/toolkit/service/ApplicationContext.java b/src/com/vaadin/service/ApplicationContext.java
index 3bc0a29822..c5bafa8a6d 100644
--- a/src/com/itmill/toolkit/service/ApplicationContext.java
+++ b/src/com/vaadin/service/ApplicationContext.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.service;
+package com.vaadin.service;
 
 import java.io.File;
 import java.io.Serializable;
 import java.util.Collection;
 
-import com.itmill.toolkit.Application;
+import com.vaadin.Application;
 
 /**
  * <code>ApplicationContext</code> provides information about the running
diff --git a/src/com/itmill/toolkit/service/FileTypeResolver.java b/src/com/vaadin/service/FileTypeResolver.java
index 6a53441161..599cce924f 100644
--- a/src/com/itmill/toolkit/service/FileTypeResolver.java
+++ b/src/com/vaadin/service/FileTypeResolver.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.service;
+package com.vaadin.service;
 
 import java.io.File;
 import java.io.Serializable;
@@ -11,8 +11,8 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.ThemeResource;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.ThemeResource;
 
 /**
  * Utility class that can figure out mime-types and icons related to files.
diff --git a/src/com/itmill/toolkit/service/package.html b/src/com/vaadin/service/package.html
index 03857d9cad..03857d9cad 100644
--- a/src/com/itmill/toolkit/service/package.html
+++ b/src/com/vaadin/service/package.html
diff --git a/src/com/itmill/toolkit/terminal/ApplicationResource.java b/src/com/vaadin/terminal/ApplicationResource.java
index c67de1a7a4..85da38cc93 100644
--- a/src/com/itmill/toolkit/terminal/ApplicationResource.java
+++ b/src/com/vaadin/terminal/ApplicationResource.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.Application;
+import com.vaadin.Application;
 
 /**
  * This interface must be implemented by classes wishing to provide Application
diff --git a/src/com/itmill/toolkit/terminal/ClassResource.java b/src/com/vaadin/terminal/ClassResource.java
index a8062940bb..6d604aeea2 100644
--- a/src/com/itmill/toolkit/terminal/ClassResource.java
+++ b/src/com/vaadin/terminal/ClassResource.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.service.FileTypeResolver;
+import com.vaadin.Application;
+import com.vaadin.service.FileTypeResolver;
 
 /**
  * <code>ClassResource</code> is a named resource accessed with the class
@@ -93,7 +93,7 @@ public class ClassResource implements ApplicationResource, Serializable {
     /**
      * Gets the MIME type of this resource.
      * 
-     * @see com.itmill.toolkit.terminal.Resource#getMIMEType()
+     * @see com.vaadin.terminal.Resource#getMIMEType()
      */
     public String getMIMEType() {
         return FileTypeResolver.getMIMEType(resourceName);
@@ -102,7 +102,7 @@ public class ClassResource implements ApplicationResource, Serializable {
     /**
      * Gets the application of this resource.
      * 
-     * @see com.itmill.toolkit.terminal.ApplicationResource#getApplication()
+     * @see com.vaadin.terminal.ApplicationResource#getApplication()
      */
     public Application getApplication() {
         return application;
@@ -112,7 +112,7 @@ public class ClassResource implements ApplicationResource, Serializable {
      * Gets the virtual filename for this resource.
      * 
      * @return the file name associated to this resource.
-     * @see com.itmill.toolkit.terminal.ApplicationResource#getFilename()
+     * @see com.vaadin.terminal.ApplicationResource#getFilename()
      */
     public String getFilename() {
         int index = 0;
@@ -127,7 +127,7 @@ public class ClassResource implements ApplicationResource, Serializable {
     /**
      * Gets resource as stream.
      * 
-     * @see com.itmill.toolkit.terminal.ApplicationResource#getStream()
+     * @see com.vaadin.terminal.ApplicationResource#getStream()
      */
     public DownloadStream getStream() {
         final DownloadStream ds = new DownloadStream(associatedClass
diff --git a/src/com/itmill/toolkit/terminal/CompositeErrorMessage.java b/src/com/vaadin/terminal/CompositeErrorMessage.java
index 7af3ac4628..776e6c919c 100644
--- a/src/com/itmill/toolkit/terminal/CompositeErrorMessage.java
+++ b/src/com/vaadin/terminal/CompositeErrorMessage.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -77,7 +77,7 @@ public class CompositeErrorMessage implements ErrorMessage, Serializable {
     /**
      * The error level is the largest error level in
      * 
-     * @see com.itmill.toolkit.terminal.ErrorMessage#getErrorLevel()
+     * @see com.vaadin.terminal.ErrorMessage#getErrorLevel()
      */
     public final int getErrorLevel() {
         return level;
@@ -110,7 +110,7 @@ public class CompositeErrorMessage implements ErrorMessage, Serializable {
     }
 
     /**
-     * @see com.itmill.toolkit.terminal.Paintable#paint(com.itmill.toolkit.terminal.PaintTarget)
+     * @see com.vaadin.terminal.Paintable#paint(com.vaadin.terminal.PaintTarget)
      */
     public void paint(PaintTarget target) throws PaintException {
 
diff --git a/src/com/itmill/toolkit/terminal/DownloadStream.java b/src/com/vaadin/terminal/DownloadStream.java
index 8b91e15bb1..d46f104273 100644
--- a/src/com/itmill/toolkit/terminal/DownloadStream.java
+++ b/src/com/vaadin/terminal/DownloadStream.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.InputStream;
 import java.io.Serializable;
diff --git a/src/com/itmill/toolkit/terminal/ErrorMessage.java b/src/com/vaadin/terminal/ErrorMessage.java
index 5b07dcc4f7..428a3016df 100644
--- a/src/com/itmill/toolkit/terminal/ErrorMessage.java
+++ b/src/com/vaadin/terminal/ErrorMessage.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 
@@ -55,7 +55,7 @@ public interface ErrorMessage extends Paintable, Serializable {
      * 
      * @param listener
      *            the listener to be added.
-     * @see com.itmill.toolkit.terminal.Paintable#addListener(Paintable.RepaintRequestListener)
+     * @see com.vaadin.terminal.Paintable#addListener(Paintable.RepaintRequestListener)
      */
     public void addListener(RepaintRequestListener listener);
 
@@ -65,7 +65,7 @@ public interface ErrorMessage extends Paintable, Serializable {
      * 
      * @param listener
      *            the listener to be removed.
-     * @see com.itmill.toolkit.terminal.Paintable#removeListener(Paintable.RepaintRequestListener)
+     * @see com.vaadin.terminal.Paintable#removeListener(Paintable.RepaintRequestListener)
      */
     public void removeListener(RepaintRequestListener listener);
 
@@ -73,7 +73,7 @@ public interface ErrorMessage extends Paintable, Serializable {
      * Error messages are inmodifiable and thus listeners are not needed. This
      * method should be implemented as empty.
      * 
-     * @see com.itmill.toolkit.terminal.Paintable#requestRepaint()
+     * @see com.vaadin.terminal.Paintable#requestRepaint()
      */
     public void requestRepaint();
 
diff --git a/src/com/itmill/toolkit/terminal/ExternalResource.java b/src/com/vaadin/terminal/ExternalResource.java
index 80feae3d00..c07adf7d9d 100644
--- a/src/com/itmill/toolkit/terminal/ExternalResource.java
+++ b/src/com/vaadin/terminal/ExternalResource.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 import java.net.URL;
 
-import com.itmill.toolkit.service.FileTypeResolver;
+import com.vaadin.service.FileTypeResolver;
 
 /**
  * <code>ExternalResource</code> implements source for resources fetched from
@@ -66,7 +66,7 @@ public class ExternalResource implements Resource, Serializable {
     /**
      * Gets the MIME type of the resource.
      * 
-     * @see com.itmill.toolkit.terminal.Resource#getMIMEType()
+     * @see com.vaadin.terminal.Resource#getMIMEType()
      */
     public String getMIMEType() {
         return FileTypeResolver.getMIMEType(getURL().toString());
diff --git a/src/com/itmill/toolkit/terminal/FileResource.java b/src/com/vaadin/terminal/FileResource.java
index 6fa26405e4..46f1a6c028 100644
--- a/src/com/itmill/toolkit/terminal/FileResource.java
+++ b/src/com/vaadin/terminal/FileResource.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.service.FileTypeResolver;
+import com.vaadin.Application;
+import com.vaadin.service.FileTypeResolver;
 
 /**
  * <code>FileResources</code> are files or directories on local filesystem. The
@@ -58,7 +58,7 @@ public class FileResource implements ApplicationResource {
     /**
      * Gets the resource as stream.
      * 
-     * @see com.itmill.toolkit.terminal.ApplicationResource#getStream()
+     * @see com.vaadin.terminal.ApplicationResource#getStream()
      */
     public DownloadStream getStream() {
         try {
@@ -92,21 +92,21 @@ public class FileResource implements ApplicationResource {
     }
 
     /**
-     * @see com.itmill.toolkit.terminal.ApplicationResource#getApplication()
+     * @see com.vaadin.terminal.ApplicationResource#getApplication()
      */
     public Application getApplication() {
         return application;
     }
 
     /**
-     * @see com.itmill.toolkit.terminal.ApplicationResource#getFilename()
+     * @see com.vaadin.terminal.ApplicationResource#getFilename()
      */
     public String getFilename() {
         return sourceFile.getName();
     }
 
     /**
-     * @see com.itmill.toolkit.terminal.Resource#getMIMEType()
+     * @see com.vaadin.terminal.Resource#getMIMEType()
      */
     public String getMIMEType() {
         return FileTypeResolver.getMIMEType(sourceFile);
diff --git a/src/com/itmill/toolkit/terminal/KeyMapper.java b/src/com/vaadin/terminal/KeyMapper.java
index 4747cd4e98..706b5d27e7 100644
--- a/src/com/itmill/toolkit/terminal/KeyMapper.java
+++ b/src/com/vaadin/terminal/KeyMapper.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 import java.util.Hashtable;
diff --git a/src/com/itmill/toolkit/terminal/PaintException.java b/src/com/vaadin/terminal/PaintException.java
index 8464a418bf..af025bfcaa 100644
--- a/src/com/itmill/toolkit/terminal/PaintException.java
+++ b/src/com/vaadin/terminal/PaintException.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/src/com/itmill/toolkit/terminal/PaintTarget.java b/src/com/vaadin/terminal/PaintTarget.java
index b232325831..4740c509d3 100644
--- a/src/com/itmill/toolkit/terminal/PaintTarget.java
+++ b/src/com/vaadin/terminal/PaintTarget.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 
diff --git a/src/com/itmill/toolkit/terminal/Paintable.java b/src/com/vaadin/terminal/Paintable.java
index be09df281a..b3fbdc3d9c 100644
--- a/src/com/itmill/toolkit/terminal/Paintable.java
+++ b/src/com/vaadin/terminal/Paintable.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 import java.util.EventObject;
diff --git a/src/com/itmill/toolkit/terminal/ParameterHandler.java b/src/com/vaadin/terminal/ParameterHandler.java
index 88ba0ae1c2..93b1b6bcb7 100644
--- a/src/com/itmill/toolkit/terminal/ParameterHandler.java
+++ b/src/com/vaadin/terminal/ParameterHandler.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -16,7 +16,7 @@ import java.util.Map;
  * GET and POST parameters are passed to application as external parameters on
  * Web Adapter. The parameters can be received at any time during the
  * application lifecycle. All the parameter handlers implementing this interface
- * and registered to {@link com.itmill.toolkit.ui.Window} receive all the
+ * and registered to {@link com.vaadin.ui.Window} receive all the
  * parameters got from the terminal in the given window.
  * </p>
  * 
diff --git a/src/com/itmill/toolkit/terminal/Resource.java b/src/com/vaadin/terminal/Resource.java
index 7e29ae250a..07753aad16 100644
--- a/src/com/itmill/toolkit/terminal/Resource.java
+++ b/src/com/vaadin/terminal/Resource.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 
diff --git a/src/com/itmill/toolkit/terminal/Scrollable.java b/src/com/vaadin/terminal/Scrollable.java
index 3ab1a5df5c..5f57a77e76 100644
--- a/src/com/itmill/toolkit/terminal/Scrollable.java
+++ b/src/com/vaadin/terminal/Scrollable.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 
diff --git a/src/com/itmill/toolkit/terminal/Sizeable.java b/src/com/vaadin/terminal/Sizeable.java
index 8b83012157..6c18f746f2 100644
--- a/src/com/itmill/toolkit/terminal/Sizeable.java
+++ b/src/com/vaadin/terminal/Sizeable.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 
diff --git a/src/com/itmill/toolkit/terminal/StreamResource.java b/src/com/vaadin/terminal/StreamResource.java
index 49bcc81d6f..7b4c040229 100644
--- a/src/com/itmill/toolkit/terminal/StreamResource.java
+++ b/src/com/vaadin/terminal/StreamResource.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.InputStream;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.service.FileTypeResolver;
+import com.vaadin.Application;
+import com.vaadin.service.FileTypeResolver;
 
 /**
  * <code>StreamResource</code> is a resource provided to the client directly by
@@ -76,7 +76,7 @@ public class StreamResource implements ApplicationResource {
     }
 
     /**
-     * @see com.itmill.toolkit.terminal.Resource#getMIMEType()
+     * @see com.vaadin.terminal.Resource#getMIMEType()
      */
     public String getMIMEType() {
         if (MIMEType != null) {
@@ -137,14 +137,14 @@ public class StreamResource implements ApplicationResource {
     }
 
     /**
-     * @see com.itmill.toolkit.terminal.ApplicationResource#getApplication()
+     * @see com.vaadin.terminal.ApplicationResource#getApplication()
      */
     public Application getApplication() {
         return application;
     }
 
     /**
-     * @see com.itmill.toolkit.terminal.ApplicationResource#getStream()
+     * @see com.vaadin.terminal.ApplicationResource#getStream()
      */
     public DownloadStream getStream() {
         final StreamSource ss = getStreamSource();
diff --git a/src/com/itmill/toolkit/terminal/SystemError.java b/src/com/vaadin/terminal/SystemError.java
index 8f7f19a5a6..6f29970f6b 100644
--- a/src/com/itmill/toolkit/terminal/SystemError.java
+++ b/src/com/vaadin/terminal/SystemError.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -61,14 +61,14 @@ public class SystemError extends RuntimeException implements ErrorMessage {
     }
 
     /**
-     * @see com.itmill.toolkit.terminal.ErrorMessage#getErrorLevel()
+     * @see com.vaadin.terminal.ErrorMessage#getErrorLevel()
      */
     public final int getErrorLevel() {
         return ErrorMessage.SYSTEMERROR;
     }
 
     /**
-     * @see com.itmill.toolkit.terminal.Paintable#paint(com.itmill.toolkit.terminal.PaintTarget)
+     * @see com.vaadin.terminal.Paintable#paint(com.vaadin.terminal.PaintTarget)
      */
     public void paint(PaintTarget target) throws PaintException {
 
diff --git a/src/com/itmill/toolkit/terminal/Terminal.java b/src/com/vaadin/terminal/Terminal.java
index 5f136679d9..4494bdc144 100644
--- a/src/com/itmill/toolkit/terminal/Terminal.java
+++ b/src/com/vaadin/terminal/Terminal.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 
diff --git a/src/com/itmill/toolkit/terminal/ThemeResource.java b/src/com/vaadin/terminal/ThemeResource.java
index 1fcf0dd5f3..995ae0170d 100644
--- a/src/com/itmill/toolkit/terminal/ThemeResource.java
+++ b/src/com/vaadin/terminal/ThemeResource.java
@@ -2,9 +2,9 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
-import com.itmill.toolkit.service.FileTypeResolver;
+import com.vaadin.service.FileTypeResolver;
 
 /**
  * <code>ThemeResource</code> is a named theme dependant resource provided and
@@ -87,7 +87,7 @@ public class ThemeResource implements Resource {
     }
 
     /**
-     * @see com.itmill.toolkit.terminal.Resource#getMIMEType()
+     * @see com.vaadin.terminal.Resource#getMIMEType()
      */
     public String getMIMEType() {
         return FileTypeResolver.getMIMEType(getResourceId());
diff --git a/src/com/itmill/toolkit/terminal/URIHandler.java b/src/com/vaadin/terminal/URIHandler.java
index 46fb322b0d..fe1746201e 100644
--- a/src/com/itmill/toolkit/terminal/URIHandler.java
+++ b/src/com/vaadin/terminal/URIHandler.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 import java.net.URL;
diff --git a/src/com/itmill/toolkit/terminal/UploadStream.java b/src/com/vaadin/terminal/UploadStream.java
index 225740ed43..95351e071d 100644
--- a/src/com/itmill/toolkit/terminal/UploadStream.java
+++ b/src/com/vaadin/terminal/UploadStream.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.InputStream;
 import java.io.Serializable;
@@ -10,7 +10,7 @@ import java.io.Serializable;
 /**
  * Defines a variable type, that is used for passing uploaded files from
  * terminal. Most often, file upload is implented using the
- * {@link com.itmill.toolkit.ui.Upload Upload} component.
+ * {@link com.vaadin.ui.Upload Upload} component.
  * 
  * @author IT Mill Ltd.
  * @version
diff --git a/src/com/itmill/toolkit/terminal/UserError.java b/src/com/vaadin/terminal/UserError.java
index e7c2df9004..bcce0ed283 100644
--- a/src/com/itmill/toolkit/terminal/UserError.java
+++ b/src/com/vaadin/terminal/UserError.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 /**
  * <code>UserError</code> is a controlled error occurred in application. User
diff --git a/src/com/itmill/toolkit/terminal/VariableOwner.java b/src/com/vaadin/terminal/VariableOwner.java
index fc1fe2ba16..5f6fc03877 100644
--- a/src/com/itmill/toolkit/terminal/VariableOwner.java
+++ b/src/com/vaadin/terminal/VariableOwner.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal;
+package com.vaadin.terminal;
 
 import java.io.Serializable;
 import java.util.Map;
diff --git a/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSet.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
index 1139506cc4..1606dea3c3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSet.gwt.xml
+++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
@@ -25,5 +25,5 @@
 
 	<source path="client" />
 
-	<entry-point class="com.itmill.toolkit.terminal.gwt.client.DefaultWidgetSet" />
+	<entry-point class="com.vaadin.terminal.gwt.client.DefaultWidgetSet" />
 </module>
diff --git a/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml
index 3745d3f2c0..d8d8607213 100644
--- a/src/com/itmill/toolkit/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml
+++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSetNoEntry.gwt.xml
@@ -2,5 +2,5 @@
 	<!--
 		"NoEntry" -concept deprecated, inherit DefaultWidgetSet instead.
 	-->
-	<inherits name="com.itmill.toolkit.terminal.gwt.DefaultWidgetSet" />
+	<inherits name="com.vaadin.terminal.gwt.DefaultWidgetSet" />
 </module>
 \ No newline at end of file
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index 0560385799..564a87445e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -73,29 +73,29 @@ public class ApplicationConfiguration {
     private native void loadFromDOM()
     /*-{
 
-        var id = this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::id;
+        var id = this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::id;
         if($wnd.itmill.toolkitConfigurations && $wnd.itmill.toolkitConfigurations[id]) {
             var jsobj = $wnd.itmill.toolkitConfigurations[id];
             var uri = jsobj.appUri;
             if(uri[uri.length -1] != "/") {
                 uri = uri + "/";
             }
-            this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::appUri = uri;
-            this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::pathInfo = jsobj.pathInfo;
-            this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::themeUri = jsobj.themeUri;
+            this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::appUri = uri;
+            this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::pathInfo = jsobj.pathInfo;
+            this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::themeUri = jsobj.themeUri;
             if(jsobj.windowName) {
-                this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::windowName = jsobj.windowName;
+                this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::windowName = jsobj.windowName;
             }
             if('useDebugIdInDom' in jsobj && typeof(jsobj.useDebugIdInDom) == "boolean") {
-                this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::useDebugIdInDom = jsobj.useDebugIdInDom;
+                this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::useDebugIdInDom = jsobj.useDebugIdInDom;
             }
             if(jsobj.versionInfo) {
-                this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::versionInfo = jsobj.versionInfo;
+                this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::versionInfo = jsobj.versionInfo;
             }
             if(jsobj.comErrMsg) {
-                this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::communicationErrorCaption = jsobj.comErrMsg.caption;
-                this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::communicationErrorMessage = jsobj.comErrMsg.message;
-                this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::communicationErrorUrl = jsobj.comErrMsg.url;
+                this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::communicationErrorCaption = jsobj.comErrMsg.caption;
+                this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::communicationErrorMessage = jsobj.comErrMsg.message;
+                this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::communicationErrorUrl = jsobj.comErrMsg.url;
             }
         
         } else {
@@ -187,12 +187,12 @@ public class ApplicationConfiguration {
 
     public native String getServletVersion()
     /*-{
-        return this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::versionInfo.toolkitVersion;
+        return this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::versionInfo.toolkitVersion;
     }-*/;
 
     public native String getApplicationVersion()
     /*-{
-        return this.@com.itmill.toolkit.terminal.gwt.client.ApplicationConfiguration::versionInfo.applicationVersion;
+        return this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::versionInfo.applicationVersion;
     }-*/;
 
     public boolean useDebugIdInDOM() {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index cb6874075c..db13b1f205 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -35,13 +35,13 @@ import com.google.gwt.user.client.impl.HTTPRequestImpl;
 import com.google.gwt.user.client.ui.FocusWidget;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.FloatSize;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.Size;
-import com.itmill.toolkit.terminal.gwt.client.ui.Field;
-import com.itmill.toolkit.terminal.gwt.client.ui.IContextMenu;
-import com.itmill.toolkit.terminal.gwt.client.ui.INotification;
-import com.itmill.toolkit.terminal.gwt.client.ui.IView;
-import com.itmill.toolkit.terminal.gwt.client.ui.INotification.HideEvent;
+import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize;
+import com.vaadin.terminal.gwt.client.RenderInformation.Size;
+import com.vaadin.terminal.gwt.client.ui.Field;
+import com.vaadin.terminal.gwt.client.ui.IContextMenu;
+import com.vaadin.terminal.gwt.client.ui.INotification;
+import com.vaadin.terminal.gwt.client.ui.IView;
+import com.vaadin.terminal.gwt.client.ui.INotification.HideEvent;
 
 /**
  * Entry point classes define <code>onModuleLoad()</code>.
@@ -157,9 +157,9 @@ public class ApplicationConnection {
          var ap = this;
          var client = {};
          client.isActive = function() {
-             return ap.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::hasActiveRequest()();
+             return ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::hasActiveRequest()();
          }
-         var vi = ap.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::getVersionInfo()();
+         var vi = ap.@com.vaadin.terminal.gwt.client.ApplicationConnection::getVersionInfo()();
          if (vi) {
              client.getVersionInfo = function() {
                  return vi;
@@ -167,10 +167,10 @@ public class ApplicationConnection {
          }
          
          client.getElementByPath = function(id) {
-            return componentLocator.@com.itmill.toolkit.terminal.gwt.client.ComponentLocator::getElementByPath(Ljava/lang/String;)(id);
+            return componentLocator.@com.vaadin.terminal.gwt.client.ComponentLocator::getElementByPath(Ljava/lang/String;)(id);
          }
          client.getPathForElement = function(element) {
-            return componentLocator.@com.itmill.toolkit.terminal.gwt.client.ComponentLocator::getPathForElement(Lcom/google/gwt/user/client/Element;)(element);
+            return componentLocator.@com.vaadin.terminal.gwt.client.ComponentLocator::getPathForElement(Lcom/google/gwt/user/client/Element;)(element);
          }
 
          if(!$wnd.itmill.clients) {
@@ -209,7 +209,7 @@ public class ApplicationConnection {
             if(oldSync) {
                 oldSync();
             }
-            app.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::sendPendingVariableChanges()();
+            app.@com.vaadin.terminal.gwt.client.ApplicationConnection::sendPendingVariableChanges()();
         }
         var oldForceLayout;
         if($wnd.itmill.forceLayout) {
@@ -219,7 +219,7 @@ public class ApplicationConnection {
             if(oldForceLayout) {
                 oldForceLayout();
             }
-            app.@com.itmill.toolkit.terminal.gwt.client.ApplicationConnection::forceLayout()();
+            app.@com.vaadin.terminal.gwt.client.ApplicationConnection::forceLayout()();
         }
     }-*/;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/BrowserInfo.java b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
index 1604ac65d1..8e41137e56 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/BrowserInfo.java
+++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.user.client.ui.RootPanel;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/CSSRule.java b/src/com/vaadin/terminal/gwt/client/CSSRule.java
index 2d918b81b7..eda6008c2b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/CSSRule.java
+++ b/src/com/vaadin/terminal/gwt/client/CSSRule.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.core.client.JavaScriptObject;
 
@@ -19,7 +19,7 @@ public class CSSRule {
     // stylesheet a name.
     private native void fetchRule(final String selector)
     /*-{
-        this.@com.itmill.toolkit.terminal.gwt.client.CSSRule::rules = @com.itmill.toolkit.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;)($doc.styleSheets[1], selector);
+        this.@com.vaadin.terminal.gwt.client.CSSRule::rules = @com.vaadin.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;)($doc.styleSheets[1], selector);
     }-*/;
 
     /*
@@ -46,7 +46,7 @@ public class CSSRule {
         for(var i=0; i<j; i++) {
             var r = theRules[i];
             if(r.type == 3) {
-                allMatches.unshift(@com.itmill.toolkit.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;)(r.styleSheet, selector));
+                allMatches.unshift(@com.vaadin.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;)(r.styleSheet, selector));
             } else if(r.type == 1) {
                 var selectors = r.selectorText.toLowerCase().split(",");
                 var n = selectors.length;
@@ -70,8 +70,8 @@ public class CSSRule {
      */
     public native String getPropertyValue(final String propertyName)
     /*-{  
-        for(var i=0; i<this.@com.itmill.toolkit.terminal.gwt.client.CSSRule::rules.length; i++){
-            var value = this.@com.itmill.toolkit.terminal.gwt.client.CSSRule::rules[i].style[propertyName];
+        for(var i=0; i<this.@com.vaadin.terminal.gwt.client.CSSRule::rules.length; i++){
+            var value = this.@com.vaadin.terminal.gwt.client.CSSRule::rules[i].style[propertyName];
             if(value)
                 return value;
         }
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ClientExceptionHandler.java b/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java
index 10167b7466..724bd24a69 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ClientExceptionHandler.java
+++ b/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 public class ClientExceptionHandler {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ComponentDetail.java b/src/com/vaadin/terminal/gwt/client/ComponentDetail.java
index 7a47651332..8ee91ad9e4 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ComponentDetail.java
+++ b/src/com/vaadin/terminal/gwt/client/ComponentDetail.java
@@ -1,7 +1,7 @@
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.FloatSize;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.Size;
+import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize;
+import com.vaadin.terminal.gwt.client.RenderInformation.Size;
 
 class ComponentDetail {
     private String pid;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ComponentDetailMap.java b/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java
index cc7f474a06..cab3160922 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ComponentDetailMap.java
+++ b/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ComponentLocator.java b/src/com/vaadin/terminal/gwt/client/ComponentLocator.java
index da4aea74e3..ccd0022876 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ComponentLocator.java
+++ b/src/com/vaadin/terminal/gwt/client/ComponentLocator.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -7,9 +7,9 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ui.IView;
-import com.itmill.toolkit.terminal.gwt.client.ui.IWindow;
-import com.itmill.toolkit.terminal.gwt.client.ui.SubPartAware;
+import com.vaadin.terminal.gwt.client.ui.IView;
+import com.vaadin.terminal.gwt.client.ui.IWindow;
+import com.vaadin.terminal.gwt.client.ui.SubPartAware;
 
 /**
  * ComponentLocator provides methods for uniquely identifying DOM elements using
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Console.java b/src/com/vaadin/terminal/gwt/client/Console.java
index b040ea2074..2d433f8997 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/Console.java
+++ b/src/com/vaadin/terminal/gwt/client/Console.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.Set;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Container.java b/src/com/vaadin/terminal/gwt/client/Container.java
index e3fc7c95a9..28c31fa101 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/Container.java
+++ b/src/com/vaadin/terminal/gwt/client/Container.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.Set;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ContainerResizedListener.java b/src/com/vaadin/terminal/gwt/client/ContainerResizedListener.java
index f762caa368..bfefb5dd05 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ContainerResizedListener.java
+++ b/src/com/vaadin/terminal/gwt/client/ContainerResizedListener.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 /**
  * ContainerResizedListener interface is useful for Widgets that support
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DateTimeService.java b/src/com/vaadin/terminal/gwt/client/DateTimeService.java
index ea37b7cf40..e16d9b078d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/DateTimeService.java
+++ b/src/com/vaadin/terminal/gwt/client/DateTimeService.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.Date;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java b/src/com/vaadin/terminal/gwt/client/DefaultWidgetSet.java
index 0bc849affa..104ca1d232 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetSet.java
+++ b/src/com/vaadin/terminal/gwt/client/DefaultWidgetSet.java
@@ -2,51 +2,51 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ui.IAbsoluteLayout;
-import com.itmill.toolkit.terminal.gwt.client.ui.IAccordion;
-import com.itmill.toolkit.terminal.gwt.client.ui.IButton;
-import com.itmill.toolkit.terminal.gwt.client.ui.ICheckBox;
-import com.itmill.toolkit.terminal.gwt.client.ui.ICustomComponent;
-import com.itmill.toolkit.terminal.gwt.client.ui.ICustomLayout;
-import com.itmill.toolkit.terminal.gwt.client.ui.IDateFieldCalendar;
-import com.itmill.toolkit.terminal.gwt.client.ui.IEmbedded;
-import com.itmill.toolkit.terminal.gwt.client.ui.IFilterSelect;
-import com.itmill.toolkit.terminal.gwt.client.ui.IForm;
-import com.itmill.toolkit.terminal.gwt.client.ui.IFormLayout;
-import com.itmill.toolkit.terminal.gwt.client.ui.IGridLayout;
-import com.itmill.toolkit.terminal.gwt.client.ui.IHorizontalLayout;
-import com.itmill.toolkit.terminal.gwt.client.ui.ILabel;
-import com.itmill.toolkit.terminal.gwt.client.ui.ILink;
-import com.itmill.toolkit.terminal.gwt.client.ui.IListSelect;
-import com.itmill.toolkit.terminal.gwt.client.ui.IMenuBar;
-import com.itmill.toolkit.terminal.gwt.client.ui.INativeSelect;
-import com.itmill.toolkit.terminal.gwt.client.ui.IOptionGroup;
-import com.itmill.toolkit.terminal.gwt.client.ui.IOrderedLayout;
-import com.itmill.toolkit.terminal.gwt.client.ui.IPanel;
-import com.itmill.toolkit.terminal.gwt.client.ui.IPasswordField;
-import com.itmill.toolkit.terminal.gwt.client.ui.IPopupCalendar;
-import com.itmill.toolkit.terminal.gwt.client.ui.IPopupView;
-import com.itmill.toolkit.terminal.gwt.client.ui.IProgressIndicator;
-import com.itmill.toolkit.terminal.gwt.client.ui.IScrollTable;
-import com.itmill.toolkit.terminal.gwt.client.ui.ISlider;
-import com.itmill.toolkit.terminal.gwt.client.ui.ISplitPanelHorizontal;
-import com.itmill.toolkit.terminal.gwt.client.ui.ISplitPanelVertical;
-import com.itmill.toolkit.terminal.gwt.client.ui.ITablePaging;
-import com.itmill.toolkit.terminal.gwt.client.ui.ITabsheet;
-import com.itmill.toolkit.terminal.gwt.client.ui.ITextArea;
-import com.itmill.toolkit.terminal.gwt.client.ui.ITextField;
-import com.itmill.toolkit.terminal.gwt.client.ui.ITextualDate;
-import com.itmill.toolkit.terminal.gwt.client.ui.ITree;
-import com.itmill.toolkit.terminal.gwt.client.ui.ITwinColSelect;
-import com.itmill.toolkit.terminal.gwt.client.ui.IUnknownComponent;
-import com.itmill.toolkit.terminal.gwt.client.ui.IUpload;
-import com.itmill.toolkit.terminal.gwt.client.ui.IUriFragmentUtility;
-import com.itmill.toolkit.terminal.gwt.client.ui.IVerticalLayout;
-import com.itmill.toolkit.terminal.gwt.client.ui.IWindow;
-import com.itmill.toolkit.terminal.gwt.client.ui.richtextarea.IRichTextArea;
+import com.vaadin.terminal.gwt.client.ui.IAbsoluteLayout;
+import com.vaadin.terminal.gwt.client.ui.IAccordion;
+import com.vaadin.terminal.gwt.client.ui.IButton;
+import com.vaadin.terminal.gwt.client.ui.ICheckBox;
+import com.vaadin.terminal.gwt.client.ui.ICustomComponent;
+import com.vaadin.terminal.gwt.client.ui.ICustomLayout;
+import com.vaadin.terminal.gwt.client.ui.IDateFieldCalendar;
+import com.vaadin.terminal.gwt.client.ui.IEmbedded;
+import com.vaadin.terminal.gwt.client.ui.IFilterSelect;
+import com.vaadin.terminal.gwt.client.ui.IForm;
+import com.vaadin.terminal.gwt.client.ui.IFormLayout;
+import com.vaadin.terminal.gwt.client.ui.IGridLayout;
+import com.vaadin.terminal.gwt.client.ui.IHorizontalLayout;
+import com.vaadin.terminal.gwt.client.ui.ILabel;
+import com.vaadin.terminal.gwt.client.ui.ILink;
+import com.vaadin.terminal.gwt.client.ui.IListSelect;
+import com.vaadin.terminal.gwt.client.ui.IMenuBar;
+import com.vaadin.terminal.gwt.client.ui.INativeSelect;
+import com.vaadin.terminal.gwt.client.ui.IOptionGroup;
+import com.vaadin.terminal.gwt.client.ui.IOrderedLayout;
+import com.vaadin.terminal.gwt.client.ui.IPanel;
+import com.vaadin.terminal.gwt.client.ui.IPasswordField;
+import com.vaadin.terminal.gwt.client.ui.IPopupCalendar;
+import com.vaadin.terminal.gwt.client.ui.IPopupView;
+import com.vaadin.terminal.gwt.client.ui.IProgressIndicator;
+import com.vaadin.terminal.gwt.client.ui.IScrollTable;
+import com.vaadin.terminal.gwt.client.ui.ISlider;
+import com.vaadin.terminal.gwt.client.ui.ISplitPanelHorizontal;
+import com.vaadin.terminal.gwt.client.ui.ISplitPanelVertical;
+import com.vaadin.terminal.gwt.client.ui.ITablePaging;
+import com.vaadin.terminal.gwt.client.ui.ITabsheet;
+import com.vaadin.terminal.gwt.client.ui.ITextArea;
+import com.vaadin.terminal.gwt.client.ui.ITextField;
+import com.vaadin.terminal.gwt.client.ui.ITextualDate;
+import com.vaadin.terminal.gwt.client.ui.ITree;
+import com.vaadin.terminal.gwt.client.ui.ITwinColSelect;
+import com.vaadin.terminal.gwt.client.ui.IUnknownComponent;
+import com.vaadin.terminal.gwt.client.ui.IUpload;
+import com.vaadin.terminal.gwt.client.ui.IUriFragmentUtility;
+import com.vaadin.terminal.gwt.client.ui.IVerticalLayout;
+import com.vaadin.terminal.gwt.client.ui.IWindow;
+import com.vaadin.terminal.gwt.client.ui.richtextarea.IRichTextArea;
 
 public class DefaultWidgetSet implements WidgetSet {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Focusable.java b/src/com/vaadin/terminal/gwt/client/Focusable.java
index 43d07a3ea3..bf225ad61d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/Focusable.java
+++ b/src/com/vaadin/terminal/gwt/client/Focusable.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 /**
  * GWT's HasFocus is way too overkill for just receiving focus in simple
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ICaption.java b/src/com/vaadin/terminal/gwt/client/ICaption.java
index f83bd035bb..972a844bf9 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ICaption.java
+++ b/src/com/vaadin/terminal/gwt/client/ICaption.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.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.itmill.toolkit.terminal.gwt.client.ui.Icon;
+import com.vaadin.terminal.gwt.client.ui.Icon;
 
 public class ICaption extends HTML {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ICaptionWrapper.java b/src/com/vaadin/terminal/gwt/client/ICaptionWrapper.java
index 7a5b47a168..15f1c5e820 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ICaptionWrapper.java
+++ b/src/com/vaadin/terminal/gwt/client/ICaptionWrapper.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Widget;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/IDebugConsole.java b/src/com/vaadin/terminal/gwt/client/IDebugConsole.java
index 80fa0c968d..6986aea2ed 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/IDebugConsole.java
+++ b/src/com/vaadin/terminal/gwt/client/IDebugConsole.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.List;
 import java.util.Set;
@@ -28,7 +28,7 @@ import com.google.gwt.user.client.ui.Tree;
 import com.google.gwt.user.client.ui.TreeItem;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ui.IToolkitOverlay;
+import com.vaadin.terminal.gwt.client.ui.IToolkitOverlay;
 
 public final class IDebugConsole extends IToolkitOverlay implements Console {
 
@@ -294,7 +294,7 @@ public final class IDebugConsole extends IToolkitOverlay implements Console {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.gwt.client.Console#log(java.lang.String)
+     * @see com.vaadin.terminal.gwt.client.Console#log(java.lang.String)
      */
     public void log(String msg) {
         panel.add(new HTML(msg));
@@ -306,7 +306,7 @@ public final class IDebugConsole extends IToolkitOverlay implements Console {
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.terminal.gwt.client.Console#error(java.lang.String)
+     * com.vaadin.terminal.gwt.client.Console#error(java.lang.String)
      */
     public void error(String msg) {
         panel.add((new HTML(msg)));
@@ -318,7 +318,7 @@ public final class IDebugConsole extends IToolkitOverlay implements Console {
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.terminal.gwt.client.Console#printObject(java.lang.
+     * com.vaadin.terminal.gwt.client.Console#printObject(java.lang.
      * Object)
      */
     public void printObject(Object msg) {
@@ -330,7 +330,7 @@ public final class IDebugConsole extends IToolkitOverlay implements Console {
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.terminal.gwt.client.Console#dirUIDL(com.itmill.toolkit
+     * com.vaadin.terminal.gwt.client.Console#dirUIDL(com.vaadin
      * .terminal.gwt.client.UIDL)
      */
     public void dirUIDL(UIDL u) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/IErrorMessage.java b/src/com/vaadin/terminal/gwt/client/IErrorMessage.java
index 8b1bacf5f9..0f5f45663e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/IErrorMessage.java
+++ b/src/com/vaadin/terminal/gwt/client/IErrorMessage.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.Iterator;
 
@@ -10,7 +10,7 @@ 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.itmill.toolkit.terminal.gwt.client.ui.IToolkitOverlay;
+import com.vaadin.terminal.gwt.client.ui.IToolkitOverlay;
 
 public class IErrorMessage extends FlowPanel {
     public static final String CLASSNAME = "i-errormessage";
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ITooltip.java b/src/com/vaadin/terminal/gwt/client/ITooltip.java
index 1b0bfdb90f..bbea0b4bae 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ITooltip.java
+++ b/src/com/vaadin/terminal/gwt/client/ITooltip.java
@@ -1,7 +1,7 @@
 /* 
 @ITMillApache2LicenseForJavaFiles@
  */
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
@@ -9,7 +9,7 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.FlowPanel;
-import com.itmill.toolkit.terminal.gwt.client.ui.IToolkitOverlay;
+import com.vaadin.terminal.gwt.client.ui.IToolkitOverlay;
 
 /**
  * TODO open for extension
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/LocaleNotLoadedException.java b/src/com/vaadin/terminal/gwt/client/LocaleNotLoadedException.java
index 25a7058f5d..6312801daf 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/LocaleNotLoadedException.java
+++ b/src/com/vaadin/terminal/gwt/client/LocaleNotLoadedException.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 @SuppressWarnings("serial")
 public class LocaleNotLoadedException extends Exception {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/LocaleService.java b/src/com/vaadin/terminal/gwt/client/LocaleService.java
index ed5a8432c6..b62709fb2a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/LocaleService.java
+++ b/src/com/vaadin/terminal/gwt/client/LocaleService.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/MouseEventDetails.java b/src/com/vaadin/terminal/gwt/client/MouseEventDetails.java
index 68357bb70a..175dfd8ce2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/MouseEventDetails.java
+++ b/src/com/vaadin/terminal/gwt/client/MouseEventDetails.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/NullConsole.java b/src/com/vaadin/terminal/gwt/client/NullConsole.java
index 4813c7116a..24c692d44a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/NullConsole.java
+++ b/src/com/vaadin/terminal/gwt/client/NullConsole.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.Set;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Paintable.java b/src/com/vaadin/terminal/gwt/client/Paintable.java
index 81c024be4c..d4ff755763 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/Paintable.java
+++ b/src/com/vaadin/terminal/gwt/client/Paintable.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 public interface Paintable {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/RenderInformation.java b/src/com/vaadin/terminal/gwt/client/RenderInformation.java
index d30afca1fc..4dd7d1ee2f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/RenderInformation.java
+++ b/src/com/vaadin/terminal/gwt/client/RenderInformation.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.user.client.Element;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/RenderSpace.java b/src/com/vaadin/terminal/gwt/client/RenderSpace.java
index 668f16ad17..42ec8f7fcb 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/RenderSpace.java
+++ b/src/com/vaadin/terminal/gwt/client/RenderSpace.java
@@ -1,6 +1,6 @@
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.Size;
+import com.vaadin.terminal.gwt.client.RenderInformation.Size;
 
 /**
  * Contains information about render area.
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/StyleConstants.java b/src/com/vaadin/terminal/gwt/client/StyleConstants.java
index ddf89e9531..9d8f228d3d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/StyleConstants.java
+++ b/src/com/vaadin/terminal/gwt/client/StyleConstants.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 public class StyleConstants {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/TooltipInfo.java b/src/com/vaadin/terminal/gwt/client/TooltipInfo.java
index 0ac23f3fda..9a66bb14c8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/TooltipInfo.java
+++ b/src/com/vaadin/terminal/gwt/client/TooltipInfo.java
@@ -1,7 +1,7 @@
 /* 
 @ITMillApache2LicenseForJavaFiles@
  */
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 public class TooltipInfo {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/UIDL.java b/src/com/vaadin/terminal/gwt/client/UIDL.java
index 0b75a98c3b..2205f6b6dd 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/UIDL.java
+++ b/src/com/vaadin/terminal/gwt/client/UIDL.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java
index 82dcb31666..99e9e8cce1 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/Util.java
+++ b/src/com/vaadin/terminal/gwt/client/Util.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -19,7 +19,7 @@ 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.itmill.toolkit.terminal.gwt.client.RenderInformation.FloatSize;
+import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize;
 
 public class Util {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/WidgetSet.java b/src/com/vaadin/terminal/gwt/client/WidgetSet.java
index 67b4e119a1..df005353c0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/WidgetSet.java
+++ b/src/com/vaadin/terminal/gwt/client/WidgetSet.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client;
+package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.user.client.ui.Widget;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/Action.java b/src/com/vaadin/terminal/gwt/client/ui/Action.java
index 0f059870e3..4d02f0a259 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/Action.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/Action.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.Command;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ActionOwner.java b/src/com/vaadin/terminal/gwt/client/ui/ActionOwner.java
index 647a1cfe89..42ea146837 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ActionOwner.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ActionOwner.java
@@ -1,6 +1,6 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
 
 public interface ActionOwner {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/AlignmentInfo.java b/src/com/vaadin/terminal/gwt/client/ui/AlignmentInfo.java
index cf4afb44dd..28d06c0cc2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/AlignmentInfo.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AlignmentInfo.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 public final class AlignmentInfo {
     /** Bitmask values for client server communication */
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarEntry.java b/src/com/vaadin/terminal/gwt/client/ui/CalendarEntry.java
index 551c458ed6..cfff056e69 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/CalendarEntry.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/CalendarEntry.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Date;
 
-import com.itmill.toolkit.terminal.gwt.client.DateTimeService;
+import com.vaadin.terminal.gwt.client.DateTimeService;
 
 public class CalendarEntry {
     private final String styleName;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/Field.java b/src/com/vaadin/terminal/gwt/client/ui/Field.java
index d0e1d0b666..66f6497230 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/Field.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/Field.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 /**
  * This interface indicates that the component is a Field (serverside), and
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAbsoluteLayout.java b/src/com/vaadin/terminal/gwt/client/ui/IAbsoluteLayout.java
index a64a41fa7f..06134e9515 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAbsoluteLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IAbsoluteLayout.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -15,13 +15,13 @@ 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.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.ICaption;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.ICaption;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IAbsoluteLayout extends ComplexPanel implements Container {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java b/src/com/vaadin/terminal/gwt/client/ui/IAccordion.java
index e924dfab6b..43c92cab32 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IAccordion.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -11,15 +11,15 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.ContainerResizedListener;
-import com.itmill.toolkit.terminal.gwt.client.ICaption;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+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.ICaption;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderInformation;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 public class IAccordion extends ITabsheetBase implements
         ContainerResizedListener {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java b/src/com/vaadin/terminal/gwt/client/ui/IButton.java
index b6724e4786..4a1dcbad07 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IButton.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
@@ -10,12 +10,12 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.ITooltip;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.ITooltip;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 public class IButton extends Button implements Paintable {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/ICalendarPanel.java
index 62514c49d9..31566a75b9 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICalendarPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ICalendarPanel.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Date;
 import java.util.Iterator;
@@ -18,8 +18,8 @@ import com.google.gwt.user.client.ui.SourcesMouseEvents;
 import com.google.gwt.user.client.ui.SourcesTableEvents;
 import com.google.gwt.user.client.ui.TableListener;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.DateTimeService;
-import com.itmill.toolkit.terminal.gwt.client.LocaleService;
+import com.vaadin.terminal.gwt.client.DateTimeService;
+import com.vaadin.terminal.gwt.client.LocaleService;
 
 public class ICalendarPanel extends FlexTable implements MouseListener {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICheckBox.java b/src/com/vaadin/terminal/gwt/client/ui/ICheckBox.java
index 104399d5d3..397dc89828 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICheckBox.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ICheckBox.java
@@ -2,18 +2,18 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 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.ClickListener;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.ITooltip;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.ITooltip;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 public class ICheckBox extends com.google.gwt.user.client.ui.CheckBox implements
         Paintable, Field {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IContextMenu.java b/src/com/vaadin/terminal/gwt/client/ui/IContextMenu.java
index ba7f5b509b..72a87ea188 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IContextMenu.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IContextMenu.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.dom.client.NodeList;
 import com.google.gwt.dom.client.TableRowElement;
@@ -12,7 +12,7 @@ import com.google.gwt.user.client.Window;
 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.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
 
 public class IContextMenu extends IToolkitOverlay implements SubPartAware {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomComponent.java b/src/com/vaadin/terminal/gwt/client/ui/ICustomComponent.java
index c15e8b6140..1e92111efa 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomComponent.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ICustomComponent.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Set;
 
@@ -10,12 +10,12 @@ import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 public class ICustomComponent extends SimplePanel implements Container {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java b/src/com/vaadin/terminal/gwt/client/ui/ICustomLayout.java
index 0e4f0aaa2c..ac7827f22c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ICustomLayout.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -16,17 +16,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.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.ContainerResizedListener;
-import com.itmill.toolkit.terminal.gwt.client.ICaption;
-import com.itmill.toolkit.terminal.gwt.client.ICaptionWrapper;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.FloatSize;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.ContainerResizedListener;
+import com.vaadin.terminal.gwt.client.ICaption;
+import com.vaadin.terminal.gwt.client.ICaptionWrapper;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize;
 
 /**
  * Custom Layout implements complex layout defined with HTML template.
@@ -479,7 +479,7 @@ public class ICustomLayout extends ComplexPanel implements Paintable,
     /*-{
     	var self = this;
     	element.notifyChildrenOfSizeChange = function() {
-    		self.@com.itmill.toolkit.terminal.gwt.client.ui.ICustomLayout::notifyChildrenOfSizeChange()();
+    		self.@com.vaadin.terminal.gwt.client.ui.ICustomLayout::notifyChildrenOfSizeChange()();
     	};
     }-*/;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateField.java b/src/com/vaadin/terminal/gwt/client/ui/IDateField.java
index e045d3a402..b62def236e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateField.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IDateField.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Date;
 
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.FlowPanel;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.ClientExceptionHandler;
-import com.itmill.toolkit.terminal.gwt.client.DateTimeService;
-import com.itmill.toolkit.terminal.gwt.client.ITooltip;
-import com.itmill.toolkit.terminal.gwt.client.LocaleNotLoadedException;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.ClientExceptionHandler;
+import com.vaadin.terminal.gwt.client.DateTimeService;
+import com.vaadin.terminal.gwt.client.ITooltip;
+import com.vaadin.terminal.gwt.client.LocaleNotLoadedException;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IDateField extends FlowPanel implements Paintable, Field {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateFieldCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/IDateFieldCalendar.java
index 50ab226a53..24f614702e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IDateFieldCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IDateFieldCalendar.java
@@ -2,10 +2,10 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IDateFieldCalendar extends IDateField {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IEmbedded.java b/src/com/vaadin/terminal/gwt/client/ui/IEmbedded.java
index f2c65d6de5..8c8340b470 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IEmbedded.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IEmbedded.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Iterator;
 
@@ -15,10 +15,10 @@ 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.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+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;
 
 public class IEmbedded extends HTML implements Paintable {
     private static String CLASSNAME = "i-embedded";
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/IFilterSelect.java
index 176f596ce3..ec9ecf1cf6 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IFilterSelect.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,13 +29,13 @@ import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.PopupPanel.PositionCallback;
 import com.google.gwt.user.client.ui.SuggestOracle.Suggestion;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Focusable;
-import com.itmill.toolkit.terminal.gwt.client.ITooltip;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.Focusable;
+import com.vaadin.terminal.gwt.client.ITooltip;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java b/src/com/vaadin/terminal/gwt/client/ui/IForm.java
index 1639b6693b..9e6c0f5ae2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IForm.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IForm.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Set;
 
@@ -10,15 +10,15 @@ 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.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.IErrorMessage;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.IErrorMessage;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderInformation;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 public class IForm extends ComplexPanel implements Container {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java b/src/com/vaadin/terminal/gwt/client/ui/IFormLayout.java
index 6c5b13f8e2..6d4e62b7a8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IFormLayout.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -15,14 +15,14 @@ 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.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.ITooltip;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.StyleConstants;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.ITooltip;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.StyleConstants;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 /**
  * Two col Layout that places caption on left col and field on right col
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/IGridLayout.java
index 30c0c498cf..07bb7584b4 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IGridLayout.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -18,15 +18,15 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.AbsolutePanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.StyleConstants;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
-import com.itmill.toolkit.terminal.gwt.client.ui.layout.CellBasedLayout;
-import com.itmill.toolkit.terminal.gwt.client.ui.layout.ChildComponentContainer;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.StyleConstants;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ui.layout.CellBasedLayout;
+import com.vaadin.terminal.gwt.client.ui.layout.ChildComponentContainer;
 
 public class IGridLayout extends SimplePanel implements Paintable, Container {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IHorizontalLayout.java b/src/com/vaadin/terminal/gwt/client/ui/IHorizontalLayout.java
index 5ced7fdeed..eeb2c1d1df 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IHorizontalLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IHorizontalLayout.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 public class IHorizontalLayout extends IOrderedLayout {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java b/src/com/vaadin/terminal/gwt/client/ui/ILabel.java
index 1ca24b330e..c1ef09d8bf 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ILabel.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
@@ -11,11 +11,11 @@ import com.google.gwt.dom.client.PreElement;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.HTML;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.ITooltip;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.ITooltip;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 public class ILabel extends HTML implements Paintable {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILink.java b/src/com/vaadin/terminal/gwt/client/ui/ILink.java
index 91111a6eec..2d09c2186e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILink.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ILink.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
@@ -11,11 +11,11 @@ import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.ITooltip;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.ITooltip;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 public class ILink extends HTML implements Paintable, ClickListener {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java b/src/com/vaadin/terminal/gwt/client/ui/IListSelect.java
index 8d1214fbdb..301c7aa65e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IListSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IListSelect.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Iterator;
 import java.util.Vector;
@@ -10,10 +10,10 @@ import java.util.Vector;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.ITooltip;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.ITooltip;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IListSelect extends IOptionGroupBase {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IMarginInfo.java b/src/com/vaadin/terminal/gwt/client/ui/IMarginInfo.java
index 62ef12a9bd..936639356c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IMarginInfo.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IMarginInfo.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.io.Serializable;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/IMenuBar.java
index 3002c5a703..bb9a3d53e6 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IMenuBar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IMenuBar.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -15,9 +15,9 @@ import com.google.gwt.user.client.ui.PopupListener;
 import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.UIObject;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IMenuBar extends Widget implements Paintable, PopupListener {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java b/src/com/vaadin/terminal/gwt/client/ui/INativeSelect.java
index 5c7c3b9f1f..3b063bb5bf 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/INativeSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/INativeSelect.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Iterator;
 import java.util.Vector;
 
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 public class INativeSelect extends IOptionGroupBase implements Field {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/INotification.java b/src/com/vaadin/terminal/gwt/client/ui/INotification.java
index 8df846cfea..5ebb6c710e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/INotification.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/INotification.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -15,7 +15,7 @@ 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.itmill.toolkit.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
 
 public class INotification extends IToolkitOverlay {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java b/src/com/vaadin/terminal/gwt/client/ui/IOptionGroup.java
index 88b7b36bdc..cec3d07be8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroup.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IOptionGroup.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -13,7 +13,7 @@ import com.google.gwt.user.client.ui.HasFocus;
 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.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IOptionGroup extends IOptionGroupBase {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroupBase.java b/src/com/vaadin/terminal/gwt/client/ui/IOptionGroupBase.java
index 2dc44cc33f..d91ade2639 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOptionGroupBase.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IOptionGroupBase.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Set;
 
@@ -13,10 +13,10 @@ import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.KeyboardListener;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Focusable;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Focusable;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 abstract class IOptionGroupBase extends Composite implements Paintable, Field,
         ClickListener, ChangeListener, KeyboardListener, Focusable {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/IOrderedLayout.java
index 326ce37e86..305b930351 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IOrderedLayout.java
@@ -1,20 +1,20 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Set;
 
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.FloatSize;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.Size;
-import com.itmill.toolkit.terminal.gwt.client.ui.layout.CellBasedLayout;
-import com.itmill.toolkit.terminal.gwt.client.ui.layout.ChildComponentContainer;
+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.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize;
+import com.vaadin.terminal.gwt.client.RenderInformation.Size;
+import com.vaadin.terminal.gwt.client.ui.layout.CellBasedLayout;
+import com.vaadin.terminal.gwt.client.ui.layout.ChildComponentContainer;
 
 public class IOrderedLayout extends CellBasedLayout {
 
@@ -838,7 +838,7 @@ public class IOrderedLayout extends CellBasedLayout {
         /*
          * UIDL contains component alignments as a comma separated list.
          * 
-         * See com.itmill.toolkit.terminal.gwt.client.ui.AlignmentInfo.java for
+         * See com.vaadin.terminal.gwt.client.ui.AlignmentInfo.java for
          * possible values.
          */
         final int[] alignments = uidl.getIntArrayAttribute("alignments");
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java b/src/com/vaadin/terminal/gwt/client/ui/IPanel.java
index 03cef562e0..7be9a112b3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IPanel.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Set;
 
@@ -13,14 +13,14 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderInformation;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 public class IPanel extends SimplePanel implements Container {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPasswordField.java b/src/com/vaadin/terminal/gwt/client/ui/IPasswordField.java
index 0690edff94..569076e353 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPasswordField.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IPasswordField.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.DOM;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/IPopupCalendar.java
index fc79272ba3..0b876f1cb2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IPopupCalendar.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Timer;
@@ -13,9 +13,9 @@ 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.google.gwt.user.client.ui.PopupPanel.PositionCallback;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IPopupCalendar extends ITextualDate implements Paintable, Field,
         ClickListener, PopupListener {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java b/src/com/vaadin/terminal/gwt/client/ui/IPopupView.java
index e378870edf..8e89b451c4 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IPopupView.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -14,16 +14,16 @@ import com.google.gwt.user.client.ui.PopupListener;
 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.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.ICaption;
-import com.itmill.toolkit.terminal.gwt.client.ICaptionWrapper;
-import com.itmill.toolkit.terminal.gwt.client.ITooltip;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.Size;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.ICaption;
+import com.vaadin.terminal.gwt.client.ICaptionWrapper;
+import com.vaadin.terminal.gwt.client.ITooltip;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.RenderInformation.Size;
 
 public class IPopupView extends HTML implements Container {
 
@@ -73,8 +73,8 @@ public class IPopupView extends HTML implements Container {
     /**
      * 
      * 
-     * @see com.itmill.toolkit.terminal.gwt.client.Paintable#updateFromUIDL(com.itmill.toolkit.terminal.gwt.client.UIDL,
-     *      com.itmill.toolkit.terminal.gwt.client.ApplicationConnection)
+     * @see com.vaadin.terminal.gwt.client.Paintable#updateFromUIDL(com.vaadin.terminal.gwt.client.UIDL,
+     *      com.vaadin.terminal.gwt.client.ApplicationConnection)
      */
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         // This call should be made first. Ensure correct implementation,
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java b/src/com/vaadin/terminal/gwt/client/ui/IProgressIndicator.java
index ebd7adcd27..0490dd048f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IProgressIndicator.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 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.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IProgressIndicator extends Widget implements Paintable {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/IScrollTable.java
index 89f5c01d70..2b085ebd87 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IScrollTable.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,15 +31,15 @@ import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.ScrollListener;
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.MouseEventDetails;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
-import com.itmill.toolkit.terminal.gwt.client.ui.IScrollTable.IScrollTableBody.IScrollTableRow;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ui.IScrollTable.IScrollTableBody.IScrollTableRow;
 
 /**
  * IScrollTable
@@ -2527,7 +2527,7 @@ public class IScrollTable extends FlowPanel implements Table, ScrollListener {
              * (non-Javadoc)
              * 
              * @see
-             * com.itmill.toolkit.terminal.gwt.client.ui.IActionOwner#getActions
+             * com.vaadin.terminal.gwt.client.ui.IActionOwner#getActions
              * ()
              */
             public Action[] getActions() {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java b/src/com/vaadin/terminal/gwt/client/ui/ISlider.java
index 5076dfbc75..0cd04f6e89 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ISlider.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 // 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DOM;
@@ -11,11 +11,11 @@ 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.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.ContainerResizedListener;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+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.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class ISlider extends Widget implements Paintable, Field,
         ContainerResizedListener {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java b/src/com/vaadin/terminal/gwt/client/ui/ISplitPanel.java
index 6928475549..74ca6b5125 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ISplitPanel.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Set;
 
@@ -14,15 +14,15 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.ContainerResizedListener;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.ContainerResizedListener;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderInformation;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 public class ISplitPanel extends ComplexPanel implements Container,
         ContainerResizedListener {
@@ -224,7 +224,7 @@ public class ISplitPanel extends ComplexPanel implements Container,
     /*
      * Calculates absolutely positioned container places/sizes (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.gwt.client.NeedsLayout#layout()
+     * @see com.vaadin.terminal.gwt.client.NeedsLayout#layout()
      */
     public void iLayout() {
         if (!isAttached()) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanelHorizontal.java b/src/com/vaadin/terminal/gwt/client/ui/ISplitPanelHorizontal.java
index cfc686b7c2..140881484b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanelHorizontal.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ISplitPanelHorizontal.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 public class ISplitPanelHorizontal extends ISplitPanel {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanelVertical.java b/src/com/vaadin/terminal/gwt/client/ui/ISplitPanelVertical.java
index d6e72385e3..eff00e8a43 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanelVertical.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ISplitPanelVertical.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 public class ISplitPanelVertical extends ISplitPanel {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java b/src/com/vaadin/terminal/gwt/client/ui/ITablePaging.java
index 4a2b389db2..224c549f3c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ITablePaging.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -22,9 +22,9 @@ import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 /**
  * TODO make this work (just an early prototype). We may want to have paging
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/ITabsheet.java
index f1a61edc1c..52f5a41062 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ITabsheet.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -17,14 +17,14 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.ICaption;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.ICaption;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderInformation;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 public class ITabsheet extends ITabsheetBase {
 
@@ -705,7 +705,7 @@ public class ITabsheet extends ITabsheetBase {
             /*
              * another hack for webkits. tabscroller sometimes drops without
              * "shaking it" reproducable in
-             * com.itmill.toolkit.tests.components.tabsheet.TabSheetIcons
+             * com.vaadin.tests.components.tabsheet.TabSheetIcons
              */
             final Style style = scroller.getStyle();
             style.setProperty("whiteSpace", "normal");
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetBase.java b/src/com/vaadin/terminal/gwt/client/ui/ITabsheetBase.java
index 8117ef6151..081f5977aa 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetBase.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ITabsheetBase.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -8,10 +8,10 @@ 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.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 abstract class ITabsheetBase extends ComplexPanel implements Container {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetPanel.java b/src/com/vaadin/terminal/gwt/client/ui/ITabsheetPanel.java
index 20b2309718..776e06b17b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheetPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ITabsheetPanel.java
@@ -2,18 +2,18 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 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.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.Util;
 
 /**
  * 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.itmill.toolkit.terminal.gwt.client.ui.ITabsheet}.
+ * {@link com.vaadin.terminal.gwt.client.ui.ITabsheet}.
  * 
  * 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/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextArea.java b/src/com/vaadin/terminal/gwt/client/ui/ITextArea.java
index d3538698d7..7a03f85542 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextArea.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ITextArea.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.DeferredCommand;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 /**
  * This class represents a multiline textfield (textarea).
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextField.java b/src/com/vaadin/terminal/gwt/client/ui/ITextField.java
index e21a5fe5b3..74cd1cf329 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextField.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ITextField.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
@@ -11,12 +11,12 @@ import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.FocusListener;
 import com.google.gwt.user.client.ui.TextBoxBase;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.ITooltip;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.ITooltip;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 /**
  * This class represents a basic text input field with one row.
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java b/src/com/vaadin/terminal/gwt/client/ui/ITextualDate.java
index dcd411c129..311390cbcc 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITextualDate.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ITextualDate.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Date;
 
@@ -11,15 +11,15 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.ClientExceptionHandler;
-import com.itmill.toolkit.terminal.gwt.client.ContainerResizedListener;
-import com.itmill.toolkit.terminal.gwt.client.Focusable;
-import com.itmill.toolkit.terminal.gwt.client.LocaleNotLoadedException;
-import com.itmill.toolkit.terminal.gwt.client.LocaleService;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.ClientExceptionHandler;
+import com.vaadin.terminal.gwt.client.ContainerResizedListener;
+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.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class ITextualDate extends IDateField implements Paintable, Field,
         ChangeListener, ContainerResizedListener, Focusable {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITime.java b/src/com/vaadin/terminal/gwt/client/ui/ITime.java
index 52793ccca9..43c1f9f261 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITime.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ITime.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Date;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IToolkitOverlay.java b/src/com/vaadin/terminal/gwt/client/ui/IToolkitOverlay.java
index 0ea4f14133..8399544e4f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IToolkitOverlay.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IToolkitOverlay.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.animation.client.Animation;
 import com.google.gwt.dom.client.Document;
@@ -11,7 +11,7 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.PopupListener;
 import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.RootPanel;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
 
 /**
  * In Toolkit UI this Overlay should always be used for all elements that
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java b/src/com/vaadin/terminal/gwt/client/ui/ITree.java
index 678f08a886..b322293964 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ITree.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -15,12 +15,12 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.MouseEventDetails;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java b/src/com/vaadin/terminal/gwt/client/ui/ITwinColSelect.java
index 30cf86c9c8..c29f520f8d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ITwinColSelect.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Iterator;
 import java.util.Vector;
@@ -13,7 +13,7 @@ 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.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class ITwinColSelect extends IOptionGroupBase {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUnknownComponent.java b/src/com/vaadin/terminal/gwt/client/ui/IUnknownComponent.java
index e90de5cb2d..5715ab02c8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUnknownComponent.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IUnknownComponent.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.Tree;
 import com.google.gwt.user.client.ui.VerticalPanel;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IUnknownComponent extends Composite implements Paintable {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java b/src/com/vaadin/terminal/gwt/client/ui/IUpload.java
index e70009de67..a03beed3e2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IUpload.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.Button;
@@ -15,9 +15,9 @@ import com.google.gwt.user.client.ui.FormSubmitCompleteEvent;
 import com.google.gwt.user.client.ui.FormSubmitEvent;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 public class IUpload extends FormPanel implements Paintable, ClickListener,
         FormHandler {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUriFragmentUtility.java b/src/com/vaadin/terminal/gwt/client/ui/IUriFragmentUtility.java
index 5e70708162..d2237c5f60 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUriFragmentUtility.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IUriFragmentUtility.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.HistoryListener;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+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.UIDL;
 
 /**
  * Client side implementation for UriFragmentUtility. Uses GWT's History object
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IVerticalLayout.java b/src/com/vaadin/terminal/gwt/client/ui/IVerticalLayout.java
index d61e79291a..9adeb8158e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IVerticalLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IVerticalLayout.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 public class IVerticalLayout extends IOrderedLayout {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java b/src/com/vaadin/terminal/gwt/client/ui/IView.java
index b30a1eb8af..2d8ce9a986 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IView.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -25,14 +25,14 @@ import com.google.gwt.user.client.ui.HasFocus;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.Focusable;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.Focusable;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java b/src/com/vaadin/terminal/gwt/client/ui/IWindow.java
index e58b32ab30..eaa1c99da1 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/IWindow.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.Iterator;
 import java.util.Set;
@@ -20,13 +20,13 @@ import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.ScrollListener;
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.RenderSpace;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.RenderSpace;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
 
 /**
  * "Sub window" component.
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/Icon.java b/src/com/vaadin/terminal/gwt/client/ui/Icon.java
index 9b616af785..d17227955e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/Icon.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/Icon.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.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.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
 
 public class Icon extends UIObject {
     private final ApplicationConnection client;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java
index 1fb3e3c991..a711864a37 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuBar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 /*
  * Copyright 2007 Google Inc.
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuItem.java b/src/com/vaadin/terminal/gwt/client/ui/MenuItem.java
index d12052a802..7ef8b6dff6 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/MenuItem.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/MenuItem.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 /*
  * Copyright 2007 Google Inc.
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ShortcutActionHandler.java b/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java
index c71756ad43..3acdeab171 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ShortcutActionHandler.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -14,8 +14,8 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.KeyboardListener;
 import com.google.gwt.user.client.ui.KeyboardListenerCollection;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.UIDL;
 
 /**
  * A helper class to implement keyboard shorcut handling. Keeps a list of owners
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/SubPartAware.java b/src/com/vaadin/terminal/gwt/client/ui/SubPartAware.java
index 76ba7524be..ceec985f4f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/SubPartAware.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/SubPartAware.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.Element;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/Table.java b/src/com/vaadin/terminal/gwt/client/ui/Table.java
index 40cccf00ac..ac59bc0064 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/Table.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/Table.java
@@ -2,10 +2,10 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.ui.HasWidgets;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.Paintable;
 
 public interface Table extends Paintable, HasWidgets {
     final int SELECT_MODE_NONE = 0;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java b/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java
index 5ecf2aced5..a77730f749 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 /**
  * This class is used for "row actions" in ITree and ITable
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeImages.java b/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java
index 94b89fb59a..db53653e71 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeImages.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/TreeImages.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui;
+package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_alignment.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_alignment.png
index 49b918ec0c..49b918ec0c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_alignment.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_alignment.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png
index 9fd6635765..9fd6635765 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_component_handles_the_caption.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_h150.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_h150.png
index 7cd07369dc..7cd07369dc 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_h150.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_h150.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal.png
index c2e1f49efe..c2e1f49efe 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png
index 417c9aecfd..417c9aecfd 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_horizontal_spacing.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_margin.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_margin.png
index 2f1e461b0a..2f1e461b0a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_margin.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_margin.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_no_caption.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_no_caption.png
index 63984cdee7..63984cdee7 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_no_caption.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_no_caption.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_normal_caption.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_normal_caption.png
index 1e730c072b..1e730c072b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_normal_caption.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_normal_caption.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_special-margin.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_special-margin.png
index 34e47d1551..34e47d1551 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_special-margin.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_special-margin.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical.png
index 99e3709acc..99e3709acc 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical_spacing.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical_spacing.png
index be9a4cd8c5..be9a4cd8c5 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical_spacing.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_vertical_spacing.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300.png
index 0b555ad1e7..0b555ad1e7 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300_h150.png b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300_h150.png
index 8ff42ed0f4..8ff42ed0f4 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300_h150.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/doc-files/IOrderedLayout_w300_h150.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/CellBasedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java
index f0a06c26dd..5c2c2f0204 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/CellBasedLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client.ui.layout;
+package com.vaadin.terminal.gwt.client.ui.layout;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -8,12 +8,12 @@ import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Container;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.ui.IMarginInfo;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.Paintable;
+import com.vaadin.terminal.gwt.client.UIDL;
+import com.vaadin.terminal.gwt.client.ui.IMarginInfo;
 
 public abstract class CellBasedLayout extends ComplexPanel implements Container {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java b/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
index 97e8c8c072..158138359d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/ChildComponentContainer.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client.ui.layout;
+package com.vaadin.terminal.gwt.client.ui.layout;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -10,15 +10,15 @@ import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.TableElement;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.ICaption;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.FloatSize;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.Size;
-import com.itmill.toolkit.terminal.gwt.client.ui.AlignmentInfo;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
+import com.vaadin.terminal.gwt.client.ICaption;
+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.RenderInformation.FloatSize;
+import com.vaadin.terminal.gwt.client.RenderInformation.Size;
+import com.vaadin.terminal.gwt.client.ui.AlignmentInfo;
 
 public class ChildComponentContainer extends Panel {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/Margins.java b/src/com/vaadin/terminal/gwt/client/ui/layout/Margins.java
index 06332c93ea..5010744ee5 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/layout/Margins.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/layout/Margins.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.client.ui.layout;
+package com.vaadin.terminal.gwt.client.ui.layout;
 
 public class Margins {
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/IRichTextArea.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/IRichTextArea.java
index 09142b4082..b6a3c85238 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/IRichTextArea.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/IRichTextArea.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.client.ui.richtextarea;
+package com.vaadin.terminal.gwt.client.ui.richtextarea;
 
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DOM;
@@ -16,12 +16,12 @@ import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.KeyboardListener;
 import com.google.gwt.user.client.ui.RichTextArea;
 import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
-import com.itmill.toolkit.terminal.gwt.client.Paintable;
-import com.itmill.toolkit.terminal.gwt.client.UIDL;
-import com.itmill.toolkit.terminal.gwt.client.Util;
-import com.itmill.toolkit.terminal.gwt.client.ui.Field;
+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.UIDL;
+import com.vaadin.terminal.gwt.client.Util;
+import com.vaadin.terminal.gwt.client.ui.Field;
 
 /**
  * This class implements a basic client side rich text editor component.
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/IRichTextToolbar$Strings.properties b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/IRichTextToolbar$Strings.properties
index 363b704584..363b704584 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/IRichTextToolbar$Strings.properties
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/IRichTextToolbar$Strings.properties
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/IRichTextToolbar.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/IRichTextToolbar.java
index af056fbf60..433be77464 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/IRichTextToolbar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/IRichTextToolbar.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.itmill.toolkit.terminal.gwt.client.ui.richtextarea;
+package com.vaadin.terminal.gwt.client.ui.richtextarea;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.Constants;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/backColors.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/backColors.gif
index ddfc1cea2c..ddfc1cea2c 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/backColors.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/backColors.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/bold.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/bold.gif
index 249e5afc04..249e5afc04 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/bold.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/bold.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/createLink.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/createLink.gif
index 3ab9e599f8..3ab9e599f8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/createLink.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/createLink.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/fontSizes.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fontSizes.gif
index c2f4c8cb21..c2f4c8cb21 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/fontSizes.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fontSizes.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/fonts.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fonts.gif
index 1629cabb78..1629cabb78 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/fonts.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/fonts.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/foreColors.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/foreColors.gif
index 2bb89ef189..2bb89ef189 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/foreColors.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/foreColors.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/gwtLogo.png b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/gwtLogo.png
index 80728186d8..80728186d8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/gwtLogo.png
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/gwtLogo.png
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/hr.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/hr.gif
index 3fb1607e67..3fb1607e67 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/hr.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/hr.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/indent.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/indent.gif
index 8b837f0fd9..8b837f0fd9 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/indent.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/indent.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/insertImage.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/insertImage.gif
index db61c9a3de..db61c9a3de 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/insertImage.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/insertImage.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/italic.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/italic.gif
index 2b0a5a0a06..2b0a5a0a06 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/italic.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/italic.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/justifyCenter.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyCenter.gif
index 7d22640af0..7d22640af0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/justifyCenter.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyCenter.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/justifyLeft.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyLeft.gif
index 3c0f350122..3c0f350122 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/justifyLeft.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyLeft.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/justifyRight.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyRight.gif
index 99ee25836f..99ee25836f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/justifyRight.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/justifyRight.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/ol.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ol.gif
index 833bb40667..833bb40667 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/ol.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ol.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/outdent.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/outdent.gif
index be8662411a..be8662411a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/outdent.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/outdent.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/removeFormat.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeFormat.gif
index a4339c059e..a4339c059e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/removeFormat.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeFormat.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/removeLink.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeLink.gif
index 522ab4b29e..522ab4b29e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/removeLink.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/removeLink.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/strikeThrough.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/strikeThrough.gif
index 6b174c884e..6b174c884e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/strikeThrough.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/strikeThrough.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/subscript.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/subscript.gif
index 04bba05b8b..04bba05b8b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/subscript.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/subscript.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/superscript.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/superscript.gif
index ac478eeb7e..ac478eeb7e 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/superscript.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/superscript.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/ul.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ul.gif
index 01380dbb83..01380dbb83 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/ul.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/ul.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/underline.gif b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/underline.gif
index 82bae11f59..82bae11f59 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/richtextarea/underline.gif
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/underline.gif
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 963550d08c..87f966a65b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -31,17 +31,17 @@ import javax.servlet.http.HttpSession;
 
 import org.xml.sax.SAXException;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.Application.SystemMessages;
 import com.itmill.toolkit.external.org.apache.commons.fileupload.servlet.ServletFileUpload;
-import com.itmill.toolkit.service.FileTypeResolver;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.Terminal;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.Application.SystemMessages;
+import com.vaadin.service.FileTypeResolver;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.terminal.Terminal;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.ui.Window;
 
 /**
  * Abstract implementation of the ApplicationServlet which handles all
@@ -146,7 +146,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     static final String WIDGETSET_DIRECTORY_PATH = "ITMILL/widgetsets/";
 
     // Name of the default widget set, used if not specified in web.xml
-    private static final String DEFAULT_WIDGETSET = "com.itmill.toolkit.terminal.gwt.DefaultWidgetSet";
+    private static final String DEFAULT_WIDGETSET = "com.vaadin.terminal.gwt.DefaultWidgetSet";
 
     // Widget set parameter name
     private static final String PARAMETER_WIDGETSET = "widgetset";
@@ -614,7 +614,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      *            the HTTP response to write to.
      * @throws IOException
      * 
-     * @see com.itmill.toolkit.terminal.URIHandler
+     * @see com.vaadin.terminal.URIHandler
      */
     private void handleDownload(DownloadStream stream,
             HttpServletRequest request, HttpServletResponse response)
@@ -1725,7 +1725,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
         /**
          * Gets the contained throwable.
          * 
-         * @see com.itmill.toolkit.terminal.Terminal.ErrorEvent#getThrowable()
+         * @see com.vaadin.terminal.Terminal.ErrorEvent#getThrowable()
          */
         public Throwable getThrowable() {
             return throwable;
@@ -1734,7 +1734,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
         /**
          * Gets the source ParameterHandler.
          * 
-         * @see com.itmill.toolkit.terminal.ParameterHandler.ErrorEvent#getParameterHandler()
+         * @see com.vaadin.terminal.ParameterHandler.ErrorEvent#getParameterHandler()
          */
         public ParameterHandler getParameterHandler() {
             return owner;
@@ -1765,7 +1765,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
         /**
          * Gets the contained throwable.
          * 
-         * @see com.itmill.toolkit.terminal.Terminal.ErrorEvent#getThrowable()
+         * @see com.vaadin.terminal.Terminal.ErrorEvent#getThrowable()
          */
         public Throwable getThrowable() {
             return throwable;
@@ -1774,7 +1774,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
         /**
          * Gets the source URIHandler.
          * 
-         * @see com.itmill.toolkit.terminal.URIHandler.ErrorEvent#getURIHandler()
+         * @see com.vaadin.terminal.URIHandler.ErrorEvent#getURIHandler()
          */
         public URIHandler getURIHandler() {
             return owner;
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
index eff1fe3a66..25b1c387a2 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -14,7 +14,7 @@ import javax.portlet.PortletSession;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import com.itmill.toolkit.Application;
+import com.vaadin.Application;
 
 @SuppressWarnings("serial")
 public class ApplicationPortlet implements Portlet, Serializable {
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
index 1932e0adc9..774b866a44 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationRunnerServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -9,7 +9,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.itmill.toolkit.Application;
+import com.vaadin.Application;
 
 @SuppressWarnings("serial")
 public class ApplicationRunnerServlet extends AbstractApplicationServlet {
@@ -89,11 +89,11 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
      * Parses application runner URIs.
      * 
      * If request URL is e.g.
-     * http://localhost:8080/itmill/run/com.itmill.toolkit.demo.Calc then
+     * http://localhost:8080/itmill/run/com.vaadin.demo.Calc then
      * <ul>
      * <li>context=itmill</li>
      * <li>Runner servlet=run</li>
-     * <li>Toolkit application=com.itmill.toolkit.demo.Calc</li>
+     * <li>Toolkit application=com.vaadin.demo.Calc</li>
      * </ul>
      * 
      * @param request
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
index bf26df9c5c..990c84bab0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
-import com.itmill.toolkit.Application;
+import com.vaadin.Application;
 
 /**
  * This servlet connects IT Mill Toolkit Application to Web.
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ChangeVariablesErrorEvent.java b/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java
index 53523bea5a..62d99a5f02 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ChangeVariablesErrorEvent.java
+++ b/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import java.util.Map;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.AbstractComponent.ComponentErrorEvent;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.AbstractComponent.ComponentErrorEvent;
 
 @SuppressWarnings("serial")
 public class ChangeVariablesErrorEvent implements ComponentErrorEvent {
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
index ced5ba1198..c43c857c1a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import java.io.BufferedWriter;
 import java.io.CharArrayWriter;
@@ -41,27 +41,26 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.Application.SystemMessages;
 import com.itmill.toolkit.external.org.apache.commons.fileupload.FileItemIterator;
 import com.itmill.toolkit.external.org.apache.commons.fileupload.FileItemStream;
 import com.itmill.toolkit.external.org.apache.commons.fileupload.FileUploadException;
-import com.itmill.toolkit.external.org.apache.commons.fileupload.ProgressListener;
 import com.itmill.toolkit.external.org.apache.commons.fileupload.servlet.ServletFileUpload;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.Paintable;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.terminal.UploadStream;
-import com.itmill.toolkit.terminal.VariableOwner;
-import com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent;
-import com.itmill.toolkit.terminal.Terminal.ErrorEvent;
-import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.server.ComponentSizeValidator.InvalidLayout;
-import com.itmill.toolkit.ui.AbstractField;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Upload;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.Application.SystemMessages;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.Paintable;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.terminal.UploadStream;
+import com.vaadin.terminal.VariableOwner;
+import com.vaadin.terminal.Paintable.RepaintRequestEvent;
+import com.vaadin.terminal.Terminal.ErrorEvent;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.server.ComponentSizeValidator.InvalidLayout;
+import com.vaadin.ui.AbstractField;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Upload;
+import com.vaadin.ui.Window;
 
 /**
  * Application manager processes changes and paints for single application
@@ -1213,7 +1212,7 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
     }
 
     /**
-     * @see com.itmill.toolkit.terminal.Paintable.RepaintRequestListener#repaintRequested(com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent)
+     * @see com.vaadin.terminal.Paintable.RepaintRequestListener#repaintRequested(com.vaadin.terminal.Paintable.RepaintRequestEvent)
      */
     public void repaintRequested(RepaintRequestEvent event) {
         final Paintable p = event.getPaintable();
@@ -1342,14 +1341,14 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
         }
 
         /**
-         * @see com.itmill.toolkit.terminal.Terminal.ErrorEvent#getThrowable()
+         * @see com.vaadin.terminal.Terminal.ErrorEvent#getThrowable()
          */
         public Throwable getThrowable() {
             return throwable;
         }
 
         /**
-         * @see com.itmill.toolkit.terminal.URIHandler.ErrorEvent#getURIHandler()
+         * @see com.vaadin.terminal.URIHandler.ErrorEvent#getURIHandler()
          */
         public URIHandler getURIHandler() {
             return owner;
@@ -1442,7 +1441,7 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
      *            the HTTP response to write to.
      * @return boolean <code>true</code> if the request was handled and further
      *         processing should be suppressed, <code>false</code> otherwise.
-     * @see com.itmill.toolkit.terminal.URIHandler
+     * @see com.vaadin.terminal.URIHandler
      */
     DownloadStream handleURI(Window window, HttpServletRequest request,
             HttpServletResponse response) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ComponentSizeValidator.java b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
index afc7f4f554..045b9c180d 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ComponentSizeValidator.java
+++ b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;
@@ -11,21 +11,21 @@ import java.util.Map;
 import java.util.Stack;
 import java.util.Vector;
 
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.ui.AbstractOrderedLayout;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.GridLayout.Area;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.ui.AbstractOrderedLayout;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.GridLayout.Area;
 
 @SuppressWarnings("serial")
 public class ComponentSizeValidator implements Serializable {
@@ -564,7 +564,7 @@ public class ComponentSizeValidator implements Serializable {
             } else if (parent instanceof SplitPanel
                     || parent instanceof TabSheet
                     || parent instanceof CustomComponent) {
-                // FIXME Could we use com.itmill.toolkit package name here and
+                // FIXME Could we use com.vaadin package name here and
                 // fail for all component containers?
                 // FIXME Actually this should be moved to containers so it can
                 // be implemented for custom containers
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/HttpUploadStream.java b/src/com/vaadin/terminal/gwt/server/HttpUploadStream.java
index 8026215088..c9e3c77cad 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/HttpUploadStream.java
+++ b/src/com/vaadin/terminal/gwt/server/HttpUploadStream.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import java.io.InputStream;
 
@@ -16,7 +16,7 @@ import java.io.InputStream;
  */
 @SuppressWarnings("serial")
 public class HttpUploadStream implements
-        com.itmill.toolkit.terminal.UploadStream {
+        com.vaadin.terminal.UploadStream {
 
     /**
      * Holds value of property variableName.
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
index 95818a4e46..b81e65e429 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/JsonPaintTarget.java
+++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import java.io.PrintWriter;
 import java.io.Serializable;
@@ -13,16 +13,16 @@ import java.util.Set;
 import java.util.Stack;
 import java.util.Vector;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ApplicationResource;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Paintable;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.terminal.VariableOwner;
-import com.itmill.toolkit.ui.Component;
+import com.vaadin.Application;
+import com.vaadin.terminal.ApplicationResource;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Paintable;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.terminal.VariableOwner;
+import com.vaadin.ui.Component;
 
 /**
  * User Interface Description Language Target.
@@ -701,7 +701,7 @@ public class JsonPaintTarget implements PaintTarget {
      * @throws PaintException
      *             if the paint operation failed.
      * 
-     * @see com.itmill.toolkit.terminal.PaintTarget#addXMLSection(String,
+     * @see com.vaadin.terminal.PaintTarget#addXMLSection(String,
      *      String, String)
      */
     public void addXMLSection(String sectionTagName, String sectionData,
@@ -767,7 +767,7 @@ public class JsonPaintTarget implements PaintTarget {
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.terminal.PaintTarget#startTag(com.itmill.toolkit.terminal
+     * com.vaadin.terminal.PaintTarget#startTag(com.vaadin.terminal
      * .Paintable, java.lang.String)
      */
     public boolean startTag(Paintable paintable, String tagName)
@@ -799,7 +799,7 @@ public class JsonPaintTarget implements PaintTarget {
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.terminal.PaintTarget#addCharacterData(java.lang.String
+     * com.vaadin.terminal.PaintTarget#addCharacterData(java.lang.String
      * )
      */
     public void addCharacterData(String text) throws PaintException {
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/PortletApplicationContext.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java
index 20df917afb..87fe4104a8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/PortletApplicationContext.java
+++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -23,7 +23,7 @@ import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.servlet.http.HttpSession;
 
-import com.itmill.toolkit.Application;
+import com.vaadin.Application;
 
 /**
  * @author marc
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/SessionExpired.java b/src/com/vaadin/terminal/gwt/server/SessionExpired.java
index c6a5238e90..c2cf309837 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/SessionExpired.java
+++ b/src/com/vaadin/terminal/gwt/server/SessionExpired.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 @SuppressWarnings("serial")
 public class SessionExpired extends Exception {
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/SystemMessageException.java b/src/com/vaadin/terminal/gwt/server/SystemMessageException.java
index 098c728587..67731d5627 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/SystemMessageException.java
+++ b/src/com/vaadin/terminal/gwt/server/SystemMessageException.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 @SuppressWarnings("serial")
 public class SystemMessageException extends RuntimeException {
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java
index 4f2ca1817f..0cc83f21f5 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java
+++ b/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -21,8 +21,8 @@ import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.service.ApplicationContext;
+import com.vaadin.Application;
+import com.vaadin.service.ApplicationContext;
 
 /**
  * Web application context for the IT Mill Toolkit applications.
@@ -57,7 +57,7 @@ public class WebApplicationContext implements ApplicationContext,
     /**
      * Gets the application context base directory.
      * 
-     * @see com.itmill.toolkit.service.ApplicationContext#getBaseDirectory()
+     * @see com.vaadin.service.ApplicationContext#getBaseDirectory()
      */
     public File getBaseDirectory() {
         final String realPath = ApplicationServlet.getResourcePath(session
@@ -80,7 +80,7 @@ public class WebApplicationContext implements ApplicationContext,
     /**
      * Gets the applications in this context.
      * 
-     * @see com.itmill.toolkit.service.ApplicationContext#getApplications()
+     * @see com.vaadin.service.ApplicationContext#getApplications()
      */
     public Collection getApplications() {
         return Collections.unmodifiableCollection(applications);
@@ -127,7 +127,7 @@ public class WebApplicationContext implements ApplicationContext,
     /**
      * Adds the transaction listener to this context.
      * 
-     * @see com.itmill.toolkit.service.ApplicationContext#addTransactionListener(com.itmill.toolkit.service.ApplicationContext.TransactionListener)
+     * @see com.vaadin.service.ApplicationContext#addTransactionListener(com.vaadin.service.ApplicationContext.TransactionListener)
      */
     public void addTransactionListener(TransactionListener listener) {
         if (listeners == null) {
@@ -139,7 +139,7 @@ public class WebApplicationContext implements ApplicationContext,
     /**
      * Removes the transaction listener from this context.
      * 
-     * @see com.itmill.toolkit.service.ApplicationContext#removeTransactionListener(com.itmill.toolkit.service.ApplicationContext.TransactionListener)
+     * @see com.vaadin.service.ApplicationContext#removeTransactionListener(com.vaadin.service.ApplicationContext.TransactionListener)
      */
     public void removeTransactionListener(TransactionListener listener) {
         if (listeners != null) {
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/WebBrowser.java b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
index 789c28b843..2ec726fc6a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/WebBrowser.java
+++ b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.terminal.gwt.server;
+package com.vaadin.terminal.gwt.server;
 
 import java.util.Locale;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.itmill.toolkit.terminal.Terminal;
+import com.vaadin.terminal.Terminal;
 
 @SuppressWarnings("serial")
 public class WebBrowser implements Terminal {
diff --git a/src/com/itmill/toolkit/terminal/package.html b/src/com/vaadin/terminal/package.html
index 83514a0de5..83514a0de5 100644
--- a/src/com/itmill/toolkit/terminal/package.html
+++ b/src/com/vaadin/terminal/package.html
diff --git a/src/com/itmill/toolkit/tests/BasicRandomTest.java b/src/com/vaadin/tests/BasicRandomTest.java
index 9486811026..f78b0ca673 100644
--- a/src/com/itmill/toolkit/tests/BasicRandomTest.java
+++ b/src/com/vaadin/tests/BasicRandomTest.java
@@ -2,24 +2,24 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Random;
 
-import com.itmill.toolkit.tests.util.RandomComponents;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.tests.util.RandomComponents;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 /**
  * ATFTest is an application that is used to ensure compatibility with automated
@@ -44,7 +44,7 @@ import com.itmill.toolkit.ui.Window;
  * @author IT Mill Ltd.
  * 
  */
-public class BasicRandomTest extends com.itmill.toolkit.Application implements
+public class BasicRandomTest extends com.vaadin.Application implements
         Button.ClickListener {
 
     // Seed with fixed number to ensure predeterministic AUT behaviour
@@ -341,7 +341,7 @@ public class BasicRandomTest extends com.itmill.toolkit.Application implements
      */
     @Override
     public void terminalError(
-            com.itmill.toolkit.terminal.Terminal.ErrorEvent event) {
+            com.vaadin.terminal.Terminal.ErrorEvent event) {
         final Throwable e = event.getThrowable();
         System.err.println(getUser().toString() + " terminalError: "
                 + e.toString());
diff --git a/src/com/itmill/toolkit/tests/CustomLayoutDemo.java b/src/com/vaadin/tests/CustomLayoutDemo.java
index 32b1176c9d..df99f145a6 100644
--- a/src/com/itmill/toolkit/tests/CustomLayoutDemo.java
+++ b/src/com/vaadin/tests/CustomLayoutDemo.java
@@ -2,18 +2,18 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Component.Event;
-import com.itmill.toolkit.ui.Component.Listener;
+package com.vaadin.tests;
+
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Component.Event;
+import com.vaadin.ui.Component.Listener;
 
 /**
  * This example demonstrates custom layout. All components created here are
@@ -28,7 +28,7 @@ import com.itmill.toolkit.ui.Component.Listener;
  * @since 4.0.0
  * 
  */
-public class CustomLayoutDemo extends com.itmill.toolkit.Application implements
+public class CustomLayoutDemo extends com.vaadin.Application implements
         Listener {
 
     private CustomLayout mainLayout = null;
diff --git a/src/com/itmill/toolkit/tests/FocusingComponents.java b/src/com/vaadin/tests/FocusingComponents.java
index 85838a838c..0f1fb6ccb0 100644
--- a/src/com/itmill/toolkit/tests/FocusingComponents.java
+++ b/src/com/vaadin/tests/FocusingComponents.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.ListSelect;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Simple test helper to test Focusable.focus() method.
diff --git a/src/com/itmill/toolkit/tests/LayoutDemo.java b/src/com/vaadin/tests/LayoutDemo.java
index cc9235c903..cbdc7baf45 100644
--- a/src/com/itmill/toolkit/tests/LayoutDemo.java
+++ b/src/com/vaadin/tests/LayoutDemo.java
@@ -2,18 +2,18 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Window;
 
 /**
  * This example demonstrates layouts. Layouts are populated with sample Toolkit
@@ -23,7 +23,7 @@ import com.itmill.toolkit.ui.Window;
  * @since 4.0.0
  * 
  */
-public class LayoutDemo extends com.itmill.toolkit.Application {
+public class LayoutDemo extends com.vaadin.Application {
 
     /**
      * Initialize Application. Demo components are added to main window.
@@ -111,7 +111,7 @@ public class LayoutDemo extends com.itmill.toolkit.Application {
     }
 
     private Component getExamplePicture(String caption) {
-        // loads image from package com.itmill-toolkit.demo
+        // loads image from package com.vaadin.demo
         final ClassResource cr = new ClassResource("m-bullet-blue.gif", this);
         final Embedded em = new Embedded("Embedded " + caption, cr);
         em.setWidth(170);
diff --git a/src/com/itmill/toolkit/tests/ListenerOrder.java b/src/com/vaadin/tests/ListenerOrder.java
index 21b0f381d2..6f62f6a83e 100644
--- a/src/com/itmill/toolkit/tests/ListenerOrder.java
+++ b/src/com/vaadin/tests/ListenerOrder.java
@@ -1,22 +1,22 @@
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Container.ItemSetChangeEvent;
-import com.itmill.toolkit.data.Container.ItemSetChangeListener;
-import com.itmill.toolkit.data.Container.PropertySetChangeEvent;
-import com.itmill.toolkit.data.Container.PropertySetChangeListener;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-
-public class ListenerOrder extends com.itmill.toolkit.Application implements
+import com.vaadin.data.Item;
+import com.vaadin.data.Container.ItemSetChangeEvent;
+import com.vaadin.data.Container.ItemSetChangeListener;
+import com.vaadin.data.Container.PropertySetChangeEvent;
+import com.vaadin.data.Container.PropertySetChangeListener;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+
+public class ListenerOrder extends com.vaadin.Application implements
         Button.ClickListener, PropertySetChangeListener, ItemSetChangeListener,
         ValueChangeListener {
 
diff --git a/src/com/itmill/toolkit/tests/ModalWindow.java b/src/com/vaadin/tests/ModalWindow.java
index a91ddd7cc1..90d239abfd 100644
--- a/src/com/itmill/toolkit/tests/ModalWindow.java
+++ b/src/com/vaadin/tests/ModalWindow.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 /**
  * Simple program that demonstrates "modal windows" that block all access other
@@ -17,11 +17,11 @@ import com.itmill.toolkit.ui.Button.ClickListener;
  * 
  * @author IT Mill Ltd.
  * @since 4.0.1
- * @see com.itmill.toolkit.Application
- * @see com.itmill.toolkit.ui.Window
- * @see com.itmill.toolkit.ui.Label
+ * @see com.vaadin.Application
+ * @see com.vaadin.ui.Window
+ * @see com.vaadin.ui.Label
  */
-public class ModalWindow extends com.itmill.toolkit.Application implements
+public class ModalWindow extends com.vaadin.Application implements
         ClickListener {
 
     private Window test;
diff --git a/src/com/itmill/toolkit/tests/NativeWindowing.java b/src/com/vaadin/tests/NativeWindowing.java
index 79d8ba1c46..13c3139036 100644
--- a/src/com/itmill/toolkit/tests/NativeWindowing.java
+++ b/src/com/vaadin/tests/NativeWindowing.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class NativeWindowing extends Application {
 
@@ -80,7 +80,7 @@ public class NativeWindowing extends Application {
                         try {
                             main
                                     .open(
-                                            new com.itmill.toolkit.terminal.ExternalResource(
+                                            new com.vaadin.terminal.ExternalResource(
                                                     new URL(
                                                             getURL(),
                                                             "mainwin-"
diff --git a/src/com/itmill/toolkit/tests/OrderedLayoutSwapComponents.java b/src/com/vaadin/tests/OrderedLayoutSwapComponents.java
index 3baf8c4813..89382053d4 100644
--- a/src/com/itmill/toolkit/tests/OrderedLayoutSwapComponents.java
+++ b/src/com/vaadin/tests/OrderedLayoutSwapComponents.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.ArrayList;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/tests/Parameters.java b/src/com/vaadin/tests/Parameters.java
index 6b95da10aa..6d887b03ad 100644
--- a/src/com/itmill/toolkit/tests/Parameters.java
+++ b/src/com/vaadin/tests/Parameters.java
@@ -2,22 +2,22 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.net.URL;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 /**
  * This is a demonstration of how URL parameters can be recieved and handled.
@@ -26,7 +26,7 @@ import com.itmill.toolkit.ui.Window;
  * 
  * @since 3.1.1
  */
-public class Parameters extends com.itmill.toolkit.Application implements
+public class Parameters extends com.vaadin.Application implements
         URIHandler, ParameterHandler {
 
     private final Label context = new Label();
@@ -95,7 +95,7 @@ public class Parameters extends com.itmill.toolkit.Application implements
     /**
      * Update URI
      * 
-     * @see com.itmill.toolkit.terminal.URIHandler#handleURI(URL, String)
+     * @see com.vaadin.terminal.URIHandler#handleURI(URL, String)
      */
     @Override
     public DownloadStream handleURI(URL context, String relativeUri) {
diff --git a/src/com/itmill/toolkit/tests/PerformanceTestBasicComponentRendering.java b/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
index c56822dca3..be0e64dd79 100644
--- a/src/com/itmill/toolkit/tests/PerformanceTestBasicComponentRendering.java
+++ b/src/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
@@ -2,21 +2,21 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.Date;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
 
 public class PerformanceTestBasicComponentRendering extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/PerformanceTestLabelsAndOrderedLayouts.java b/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
index 10bbeab500..6b5f271dbe 100644
--- a/src/com/itmill/toolkit/tests/PerformanceTestLabelsAndOrderedLayouts.java
+++ b/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.Date;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class PerformanceTestLabelsAndOrderedLayouts extends CustomComponent {
     private final OrderedLayout main;
diff --git a/src/com/itmill/toolkit/tests/PerformanceTestSubTreeCaching.java b/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java
index 5fecaece1b..aeec8176d8 100644
--- a/src/com/itmill/toolkit/tests/PerformanceTestSubTreeCaching.java
+++ b/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.Date;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
 
 public class PerformanceTestSubTreeCaching extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/QueryContainerDemo.java b/src/com/vaadin/tests/QueryContainerDemo.java
index f75b0e743c..cb35e2c938 100644
--- a/src/com/itmill/toolkit/tests/QueryContainerDemo.java
+++ b/src/com/vaadin/tests/QueryContainerDemo.java
@@ -2,35 +2,35 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.sql.SQLException;
 
-import com.itmill.toolkit.data.util.QueryContainer;
-import com.itmill.toolkit.demo.util.SampleDatabase;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.data.util.QueryContainer;
+import com.vaadin.demo.util.SampleDatabase;
+import com.vaadin.event.Action;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Window;
 
 /**
  * This example shows how Table, Select and Tree UI components can use
  * Containers. QueryContainer is used to bind SQL table rows into Toolkit UI
  * components. Table has few example actions added. Also embedding XHTML through
  * Label components is used. Demonstrates: how to create
- * <code>com.itmill.toolkit.data.Container</code> and set it as datasource to UI
- * components <code>com.itmill.toolkit.ui.Component.Tree</code>, how to receive
+ * <code>com.vaadin.data.Container</code> and set it as datasource to UI
+ * components <code>com.vaadin.ui.Component.Tree</code>, how to receive
  * ExpandEvent and implement
- * <code>com.itmill.toolkit.ui.Tree.ExpandListener</code>, how to use
- * <code>com.itmill.toolkit.event.Action</code>.
+ * <code>com.vaadin.ui.Tree.ExpandListener</code>, how to use
+ * <code>com.vaadin.event.Action</code>.
  * 
  * @author IT Mill Ltd.
  * @since 4.0.0
  * 
  */
-public class QueryContainerDemo extends com.itmill.toolkit.Application
+public class QueryContainerDemo extends com.vaadin.Application
         implements Action.Handler {
 
     private static final String ACTION_DESCRIPTION = "Try right mouse button to initiate "
diff --git a/src/com/itmill/toolkit/tests/RandomLayoutStress.java b/src/com/vaadin/tests/RandomLayoutStress.java
index c515a2cf9c..7294ebf2a4 100644
--- a/src/com/itmill/toolkit/tests/RandomLayoutStress.java
+++ b/src/com/vaadin/tests/RandomLayoutStress.java
@@ -2,25 +2,25 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.Random;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 /**
  * This example demonstrates layouts. Layouts are populated with sample Toolkit
@@ -29,7 +29,7 @@ import com.itmill.toolkit.ui.Window;
  * @author IT Mill Ltd.
  * 
  */
-public class RandomLayoutStress extends com.itmill.toolkit.Application {
+public class RandomLayoutStress extends com.vaadin.Application {
 
     private final Random seededRandom = new Random(1);
 
diff --git a/src/com/itmill/toolkit/tests/ScrollbarStressTest.java b/src/com/vaadin/tests/ScrollbarStressTest.java
index 29f02f0111..b6cef8353a 100644
--- a/src/com/itmill/toolkit/tests/ScrollbarStressTest.java
+++ b/src/com/vaadin/tests/ScrollbarStressTest.java
@@ -1,20 +1,20 @@
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class ScrollbarStressTest extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/StressComponentsInTable.java b/src/com/vaadin/tests/StressComponentsInTable.java
index a5be787407..6f04f5b731 100644
--- a/src/com/itmill/toolkit/tests/StressComponentsInTable.java
+++ b/src/com/vaadin/tests/StressComponentsInTable.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.Date;
 import java.util.Vector;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class StressComponentsInTable extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/TableChangingDatasource.java b/src/com/vaadin/tests/TableChangingDatasource.java
index 0956a832e0..9de6c9aa1b 100644
--- a/src/com/itmill/toolkit/tests/TableChangingDatasource.java
+++ b/src/com/vaadin/tests/TableChangingDatasource.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests;
+
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class TableChangingDatasource extends CustomComponent implements
         ClickListener {
diff --git a/src/com/itmill/toolkit/tests/TableSelectTest.java b/src/com/vaadin/tests/TableSelectTest.java
index 4307eb6b7f..69363bd0bc 100644
--- a/src/com/itmill/toolkit/tests/TableSelectTest.java
+++ b/src/com/vaadin/tests/TableSelectTest.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
 
 public class TableSelectTest extends CustomComponent implements
         Table.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/tests/TestBench.java b/src/com/vaadin/tests/TestBench.java
index 1ea727a8a3..a77e60fa65 100644
--- a/src/com/itmill/toolkit/tests/TestBench.java
+++ b/src/com/vaadin/tests/TestBench.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.io.File;
 import java.net.URL;
@@ -12,23 +12,23 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.UriFragmentUtility;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.UriFragmentUtility.FragmentChangedEvent;
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.HierarchicalContainer;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.UriFragmentUtility;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.UriFragmentUtility.FragmentChangedEvent;
 
 /**
  * TestBench finds out testable classes within given java packages and adds them
@@ -40,15 +40,15 @@ import com.itmill.toolkit.ui.UriFragmentUtility.FragmentChangedEvent;
  * @author IT Mill Ltd.
  * 
  */
-public class TestBench extends com.itmill.toolkit.Application implements
+public class TestBench extends com.vaadin.Application implements
 		Property.ValueChangeListener {
 
 	// Add here packages which are used for finding testable classes
-	String[] testablePackages = { "com.itmill.toolkit.tests",
-			"com.itmill.toolkit.demo", "com.itmill.toolkit.demo.colorpicker",
-			"com.itmill.toolkit.demo.reservation",
-			"com.itmill.toolkit.demo.features",
-			"com.itmill.toolkit.tests.tickets", "com.itmill.toolkit.tests.book" };
+	String[] testablePackages = { "com.vaadin.tests",
+			"com.vaadin.demo", "com.vaadin.demo.colorpicker",
+			"com.vaadin.demo.reservation",
+			"com.vaadin.demo.features",
+			"com.vaadin.tests.tickets", "com.vaadin.tests.book" };
 
 	HierarchicalContainer testables = new HierarchicalContainer();
 
@@ -302,10 +302,10 @@ public class TestBench extends com.itmill.toolkit.Application implements
 						final Class c = Class.forName(p);
 						if (c.getSuperclass() != null) {
 							if ((c.getSuperclass()
-									.equals(com.itmill.toolkit.Application.class))) {
+									.equals(com.vaadin.Application.class))) {
 								classes.add(c);
 							} else if ((c.getSuperclass()
-									.equals(com.itmill.toolkit.ui.CustomComponent.class))) {
+									.equals(com.vaadin.ui.CustomComponent.class))) {
 								classes.add(c);
 							}
 						}
diff --git a/src/com/itmill/toolkit/tests/TestCaptionWrapper.java b/src/com/vaadin/tests/TestCaptionWrapper.java
index 7843cc11d2..62aa8659fe 100644
--- a/src/com/itmill/toolkit/tests/TestCaptionWrapper.java
+++ b/src/com/vaadin/tests/TestCaptionWrapper.java
@@ -2,39 +2,39 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.ProgressIndicator;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Slider;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.TwinColSelect;
-import com.itmill.toolkit.ui.Upload;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Component.Listener;
+package com.vaadin.tests;
+
+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;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Slider;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.TwinColSelect;
+import com.vaadin.ui.Upload;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Component.Listener;
 
 public class TestCaptionWrapper extends CustomComponent implements Listener {
 
diff --git a/src/com/itmill/toolkit/tests/TestComponentAddAndRecursion.java b/src/com/vaadin/tests/TestComponentAddAndRecursion.java
index ceca75094f..469d620b53 100644
--- a/src/com/itmill/toolkit/tests/TestComponentAddAndRecursion.java
+++ b/src/com/vaadin/tests/TestComponentAddAndRecursion.java
@@ -1,16 +1,16 @@
 /**
  * 
  */
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests;
+
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * @author marc
diff --git a/src/com/itmill/toolkit/tests/TestComponentsAndLayouts.java b/src/com/vaadin/tests/TestComponentsAndLayouts.java
index b1f454834e..02593c983f 100644
--- a/src/com/itmill/toolkit/tests/TestComponentsAndLayouts.java
+++ b/src/com/vaadin/tests/TestComponentsAndLayouts.java
@@ -2,52 +2,52 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.io.File;
 import java.sql.SQLException;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.util.FilesystemContainer;
-import com.itmill.toolkit.data.util.QueryContainer;
-import com.itmill.toolkit.demo.util.SampleDatabase;
-import com.itmill.toolkit.demo.util.SampleDirectory;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Slider;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.TwinColSelect;
-import com.itmill.toolkit.ui.Upload;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Component.Event;
-import com.itmill.toolkit.ui.Component.Listener;
+import com.vaadin.Application;
+import com.vaadin.data.Container;
+import com.vaadin.data.util.FilesystemContainer;
+import com.vaadin.data.util.QueryContainer;
+import com.vaadin.demo.util.SampleDatabase;
+import com.vaadin.demo.util.SampleDirectory;
+import com.vaadin.event.Action;
+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.Accordion;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Slider;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.TwinColSelect;
+import com.vaadin.ui.Upload;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Component.Event;
+import com.vaadin.ui.Component.Listener;
 
 /**
  * Search for "TWEAK these" keyword and configure Custom/AbstractComponents to
diff --git a/src/com/itmill/toolkit/tests/TestContainerChanges.java b/src/com/vaadin/tests/TestContainerChanges.java
index 010e5611c1..af27484834 100644
--- a/src/com/itmill/toolkit/tests/TestContainerChanges.java
+++ b/src/com/vaadin/tests/TestContainerChanges.java
@@ -1,23 +1,23 @@
 /**
  * 
  */
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.util.ContainerHierarchicalWrapper;
-import com.itmill.toolkit.data.util.ContainerOrderedWrapper;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.ListSelect;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests;
+
+import com.vaadin.data.Container;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.data.util.ContainerOrderedWrapper;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * @author marc
diff --git a/src/com/itmill/toolkit/tests/TestDateField.java b/src/com/vaadin/tests/TestDateField.java
index d586cdefca..39621b0b8e 100644
--- a/src/com/itmill/toolkit/tests/TestDateField.java
+++ b/src/com/vaadin/tests/TestDateField.java
@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.Locale;
 
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/tests/TestForAlignments.java b/src/com/vaadin/tests/TestForAlignments.java
index 5d8a76f320..d8c7c0d59c 100644
--- a/src/com/itmill/toolkit/tests/TestForAlignments.java
+++ b/src/com/vaadin/tests/TestForAlignments.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
 
 public class TestForAlignments extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index 3d80050b04..6de6d3c046 100644
--- a/src/com/itmill/toolkit/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests;
+
+import com.vaadin.Application;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 public class TestForApplicationLayoutThatUsesWholeBrosersSpace extends
         Application {
diff --git a/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java b/src/com/vaadin/tests/TestForBasicApplicationLayout.java
index d497d96df0..b6cd1d28a9 100644
--- a/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java
+++ b/src/com/vaadin/tests/TestForBasicApplicationLayout.java
@@ -2,22 +2,22 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.Locale;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class TestForBasicApplicationLayout extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/TestForChildComponentRendering.java b/src/com/vaadin/tests/TestForChildComponentRendering.java
index 15782ca12c..eb3c894224 100644
--- a/src/com/itmill/toolkit/tests/TestForChildComponentRendering.java
+++ b/src/com/vaadin/tests/TestForChildComponentRendering.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/tests/TestForContainerFilterable.java b/src/com/vaadin/tests/TestForContainerFilterable.java
index 05ca867979..7c261f1017 100644
--- a/src/com/itmill/toolkit/tests/TestForContainerFilterable.java
+++ b/src/com/vaadin/tests/TestForContainerFilterable.java
@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TestForContainerFilterable extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/TestForExpandLayout.java b/src/com/vaadin/tests/TestForExpandLayout.java
index 1e07bcd225..e58ec24161 100644
--- a/src/com/itmill/toolkit/tests/TestForExpandLayout.java
+++ b/src/com/vaadin/tests/TestForExpandLayout.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
+package com.vaadin.tests;
+
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/tests/TestForExpandLayout2.java b/src/com/vaadin/tests/TestForExpandLayout2.java
index f929729a72..5c6ff7955b 100644
--- a/src/com/itmill/toolkit/tests/TestForExpandLayout2.java
+++ b/src/com/vaadin/tests/TestForExpandLayout2.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/tests/TestForExpandLayout3.java b/src/com/vaadin/tests/TestForExpandLayout3.java
index c23ca34373..ae4adfcfaa 100644
--- a/src/com/itmill/toolkit/tests/TestForExpandLayout3.java
+++ b/src/com/vaadin/tests/TestForExpandLayout3.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.ExpandLayout;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.ExpandLayout;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/tests/TestForGridLayoutChildComponentRendering.java b/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
index 06889476f5..1f77d62144 100644
--- a/src/com/itmill/toolkit/tests/TestForGridLayoutChildComponentRendering.java
+++ b/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Select;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/tests/TestForMultipleStyleNames.java b/src/com/vaadin/tests/TestForMultipleStyleNames.java
index 5400ca828c..a936da4218 100644
--- a/src/com/itmill/toolkit/tests/TestForMultipleStyleNames.java
+++ b/src/com/vaadin/tests/TestForMultipleStyleNames.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TwinColSelect;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TwinColSelect;
 
 /**
  * TODO: Note you need to add Theme under WebContent/ITMILL/Themes/mytheme in
diff --git a/src/com/itmill/toolkit/tests/TestForNativeWindowing.java b/src/com/vaadin/tests/TestForNativeWindowing.java
index bc43a86c50..8311a2e955 100644
--- a/src/com/itmill/toolkit/tests/TestForNativeWindowing.java
+++ b/src/com/vaadin/tests/TestForNativeWindowing.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TestForNativeWindowing extends Application {
 
@@ -80,7 +80,7 @@ public class TestForNativeWindowing extends Application {
                         try {
                             main
                                     .open(
-                                            new com.itmill.toolkit.terminal.ExternalResource(
+                                            new com.vaadin.terminal.ExternalResource(
                                                     new URL(
                                                             getURL(),
                                                             "mainwin-"
diff --git a/src/com/itmill/toolkit/tests/TestForPreconfiguredComponents.java b/src/com/vaadin/tests/TestForPreconfiguredComponents.java
index 47c435ad82..9e39d21f52 100644
--- a/src/com/itmill/toolkit/tests/TestForPreconfiguredComponents.java
+++ b/src/com/vaadin/tests/TestForPreconfiguredComponents.java
@@ -2,24 +2,24 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.event.Action.Handler;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.TwinColSelect;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests;
+
+import com.vaadin.event.Action;
+import com.vaadin.event.Action.Handler;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.TwinColSelect;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 /**
  * @author IT Mill Ltd.
diff --git a/src/com/itmill/toolkit/tests/TestForRichTextEditor.java b/src/com/vaadin/tests/TestForRichTextEditor.java
index cc0a5878fd..7ac97ce882 100644
--- a/src/com/itmill/toolkit/tests/TestForRichTextEditor.java
+++ b/src/com/vaadin/tests/TestForRichTextEditor.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/tests/TestForTabSheet.java b/src/com/vaadin/tests/TestForTabSheet.java
index 09b7ce1c73..f53faabfcb 100644
--- a/src/com/itmill/toolkit/tests/TestForTabSheet.java
+++ b/src/com/vaadin/tests/TestForTabSheet.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
+package com.vaadin.tests;
+
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
 
 public class TestForTabSheet extends CustomComponent implements
         Button.ClickListener, TabSheet.SelectedTabChangeListener {
diff --git a/src/com/itmill/toolkit/tests/TestForTablesInitialColumnWidthLogicRendering.java b/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
index c5e8a75e04..adde3f8c0e 100644
--- a/src/com/itmill/toolkit/tests/TestForTablesInitialColumnWidthLogicRendering.java
+++ b/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.Iterator;
 import java.util.Vector;
 
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * 
diff --git a/src/com/itmill/toolkit/tests/TestForTrees.java b/src/com/vaadin/tests/TestForTrees.java
index e478efb8c7..f0f326c304 100644
--- a/src/com/itmill/toolkit/tests/TestForTrees.java
+++ b/src/com/vaadin/tests/TestForTrees.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.event.Action.Handler;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests;
+
+import com.vaadin.event.Action;
+import com.vaadin.event.Action.Handler;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 /**
  * Some test cases for trees. Events panel logs events that happen server side.
diff --git a/src/com/itmill/toolkit/tests/TestForUpload.java b/src/com/vaadin/tests/TestForUpload.java
index de60399dad..351a590b26 100644
--- a/src/com/itmill/toolkit/tests/TestForUpload.java
+++ b/src/com/vaadin/tests/TestForUpload.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -14,29 +14,29 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.terminal.StreamResource;
-import com.itmill.toolkit.ui.AbstractField;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.ProgressIndicator;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Upload;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Upload.FailedEvent;
-import com.itmill.toolkit.ui.Upload.FailedListener;
-import com.itmill.toolkit.ui.Upload.FinishedEvent;
-import com.itmill.toolkit.ui.Upload.FinishedListener;
-import com.itmill.toolkit.ui.Upload.StartedEvent;
-import com.itmill.toolkit.ui.Upload.StartedListener;
-import com.itmill.toolkit.ui.Upload.SucceededEvent;
-import com.itmill.toolkit.ui.Upload.SucceededListener;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.terminal.StreamResource;
+import com.vaadin.ui.AbstractField;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Upload;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Upload.FailedEvent;
+import com.vaadin.ui.Upload.FailedListener;
+import com.vaadin.ui.Upload.FinishedEvent;
+import com.vaadin.ui.Upload.FinishedListener;
+import com.vaadin.ui.Upload.StartedEvent;
+import com.vaadin.ui.Upload.StartedListener;
+import com.vaadin.ui.Upload.SucceededEvent;
+import com.vaadin.ui.Upload.SucceededListener;
 
 public class TestForUpload extends CustomComponent implements
         Upload.FinishedListener, FailedListener, SucceededListener,
@@ -233,7 +233,7 @@ public class TestForUpload extends CustomComponent implements
         }
 
         /**
-         * @see com.itmill.toolkit.ui.Upload.Receiver#receiveUpload(String,
+         * @see com.vaadin.ui.Upload.Receiver#receiveUpload(String,
          *      String)
          */
         public OutputStream receiveUpload(String filename, String MIMEType) {
@@ -296,7 +296,7 @@ public class TestForUpload extends CustomComponent implements
         }
 
         /**
-         * @see com.itmill.toolkit.ui.Upload.Receiver#receiveUpload(String,
+         * @see com.vaadin.ui.Upload.Receiver#receiveUpload(String,
          *      String)
          */
         public OutputStream receiveUpload(String filename, String MIMEType) {
diff --git a/src/com/itmill/toolkit/tests/TestForWindowOpen.java b/src/com/vaadin/tests/TestForWindowOpen.java
index 3db7c5c770..d6cd6fcc95 100644
--- a/src/com/itmill/toolkit/tests/TestForWindowOpen.java
+++ b/src/com/vaadin/tests/TestForWindowOpen.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TestForWindowOpen extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/TestForWindowing.java b/src/com/vaadin/tests/TestForWindowing.java
index 472b93d156..9fb3ea19ea 100644
--- a/src/com/itmill/toolkit/tests/TestForWindowing.java
+++ b/src/com/vaadin/tests/TestForWindowing.java
@@ -2,22 +2,22 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
-
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Slider;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Slider;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class TestForWindowing extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/TestIFrames.java b/src/com/vaadin/tests/TestIFrames.java
index 97dc5a05d4..6719820c44 100644
--- a/src/com/itmill/toolkit/tests/TestIFrames.java
+++ b/src/com/vaadin/tests/TestIFrames.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
 
 public class TestIFrames extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/TestSelectAndDatefieldInDeepLayouts.java b/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
index 7dc419f96f..b85c629295 100644
--- a/src/com/itmill/toolkit/tests/TestSelectAndDatefieldInDeepLayouts.java
+++ b/src/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
@@ -2,18 +2,18 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.Collection;
 import java.util.Vector;
 
-import com.itmill.toolkit.ui.AbstractLayout;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.AbstractLayout;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 /**
  * This test has a somewhat deep layout within one page. At the bottom, Select
diff --git a/src/com/itmill/toolkit/tests/TestSetVisibleAndCaching.java b/src/com/vaadin/tests/TestSetVisibleAndCaching.java
index 29a9e32456..4e7132b3c8 100644
--- a/src/com/itmill/toolkit/tests/TestSetVisibleAndCaching.java
+++ b/src/com/vaadin/tests/TestSetVisibleAndCaching.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
-public class TestSetVisibleAndCaching extends com.itmill.toolkit.Application {
+public class TestSetVisibleAndCaching extends com.vaadin.Application {
 
     Panel panelA = new Panel("Panel A");
     Panel panelB = new Panel("Panel B");
diff --git a/src/com/itmill/toolkit/tests/TestSizeableIncomponents.java b/src/com/vaadin/tests/TestSizeableIncomponents.java
index 37130d1a8c..a50a35c86b 100644
--- a/src/com/itmill/toolkit/tests/TestSizeableIncomponents.java
+++ b/src/com/vaadin/tests/TestSizeableIncomponents.java
@@ -2,32 +2,32 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+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.ui.AbstractComponent;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TestSizeableIncomponents extends Application {
 
@@ -135,7 +135,7 @@ public class TestSizeableIncomponents extends Application {
             if (f.endsWith(".class") && (f.indexOf("CustomComponent") == -1)
                     && (f.indexOf("Window") == -1)) {
                 f = f.replaceAll(".class", "");
-                String className = "com.itmill.toolkit.ui." + f;
+                String className = "com.vaadin.ui." + f;
                 Class c;
                 try {
                     c = Class.forName(className);
@@ -228,7 +228,7 @@ public class TestSizeableIncomponents extends Application {
         public String getTestableName() {
             StringBuffer sb = new StringBuffer();
             sb.append(classToTest.getName().replaceAll(
-                    "com.itmill.toolkit.ui.", ""));
+                    "com.vaadin.ui.", ""));
             sb.append("[");
             for (Iterator i = configurations.iterator(); i.hasNext();) {
                 sb.append(((Configuration) i.next()).getDescription());
diff --git a/src/com/itmill/toolkit/tests/TestSplitPanel.java b/src/com/vaadin/tests/TestSplitPanel.java
index 06d033431b..628fec96d2 100644
--- a/src/com/itmill/toolkit/tests/TestSplitPanel.java
+++ b/src/com/vaadin/tests/TestSplitPanel.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Window;
 
-public class TestSplitPanel extends com.itmill.toolkit.Application {
+public class TestSplitPanel extends com.vaadin.Application {
 
     // SplitPanel verticalSplit = new
     // SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
diff --git a/src/com/itmill/toolkit/tests/TreeFilesystem.java b/src/com/vaadin/tests/TreeFilesystem.java
index 8b3fb7e457..4291498c02 100644
--- a/src/com/itmill/toolkit/tests/TreeFilesystem.java
+++ b/src/com/vaadin/tests/TreeFilesystem.java
@@ -2,28 +2,28 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.io.File;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.demo.util.SampleDirectory;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Tree.ExpandEvent;
+import com.vaadin.data.Item;
+import com.vaadin.demo.util.SampleDirectory;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Tree.ExpandEvent;
 
 /**
  * Browsable file explorer using Toolkit Tree component. Demonstrates: how to
  * add items hierarchially into
- * <code>com.itmill.toolkit.ui.Component.Tree</code>, how to receive ExpandEvent
- * and implement <code>com.itmill.toolkit.ui.Tree.ExpandListener</code>.
+ * <code>com.vaadin.ui.Component.Tree</code>, how to receive ExpandEvent
+ * and implement <code>com.vaadin.ui.Tree.ExpandListener</code>.
  * 
  * @since 4.0.0
  * 
  */
-public class TreeFilesystem extends com.itmill.toolkit.Application implements
+public class TreeFilesystem extends com.vaadin.Application implements
         Tree.ExpandListener {
 
     // Filesystem explorer panel and it's components
diff --git a/src/com/itmill/toolkit/tests/TreeFilesystemContainer.java b/src/com/vaadin/tests/TreeFilesystemContainer.java
index d07d621440..dc56f687dc 100644
--- a/src/com/itmill/toolkit/tests/TreeFilesystemContainer.java
+++ b/src/com/vaadin/tests/TreeFilesystemContainer.java
@@ -2,34 +2,34 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.io.File;
 
-import com.itmill.toolkit.data.util.FilesystemContainer;
-import com.itmill.toolkit.data.util.FilesystemContainer.FileItem;
-import com.itmill.toolkit.demo.util.SampleDirectory;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Component.Event;
-import com.itmill.toolkit.ui.Component.Listener;
+import com.vaadin.data.util.FilesystemContainer;
+import com.vaadin.data.util.FilesystemContainer.FileItem;
+import com.vaadin.demo.util.SampleDirectory;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Component.Event;
+import com.vaadin.ui.Component.Listener;
 
 /**
  * Browsable file explorer using Toolkit Tree component. Demonstrates: how to
- * use <code>com.itmill.toolkit.ui.Component.Tree</code> datasource container,
- * how to create <code>com.itmill.toolkit.data.util.FilesystemContainer</code>,
- * how to read <code>com.itmill.toolkit.ui.Component.Event</code> objects, how
+ * use <code>com.vaadin.ui.Component.Tree</code> datasource container,
+ * how to create <code>com.vaadin.data.util.FilesystemContainer</code>,
+ * how to read <code>com.vaadin.ui.Component.Event</code> objects, how
  * to receive and handle any event by implementing
- * <code>com.itmill.toolkit.ui.Component.Listener</code>.
+ * <code>com.vaadin.ui.Component.Listener</code>.
  * 
  * @since 4.0.0
  * 
  */
-public class TreeFilesystemContainer extends com.itmill.toolkit.Application
+public class TreeFilesystemContainer extends com.vaadin.Application
         implements Listener {
 
     // Filesystem explorer panel and it's components
diff --git a/src/com/itmill/toolkit/tests/UpgradingSample.java b/src/com/vaadin/tests/UpgradingSample.java
index 40096c6456..3819b33a3c 100644
--- a/src/com/itmill/toolkit/tests/UpgradingSample.java
+++ b/src/com/vaadin/tests/UpgradingSample.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 //
 // Millstone imports were replaced
@@ -11,17 +11,17 @@ package com.itmill.toolkit.tests;
 // import org.millstone.base.ui.*;
 // import org.millstone.base.data.*;
 //
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Window;
 
 /**
  * <p>
diff --git a/src/com/itmill/toolkit/tests/UsingCustomNewItemHandlerInSelect.java b/src/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
index 7acc6b3976..b54bd3d184 100644
--- a/src/com/itmill/toolkit/tests/UsingCustomNewItemHandlerInSelect.java
+++ b/src/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.Random;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.data.Item;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class UsingCustomNewItemHandlerInSelect extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/UsingObjectsInSelect.java b/src/com/vaadin/tests/UsingObjectsInSelect.java
index 69e41e991d..6a608f17f3 100644
--- a/src/com/itmill/toolkit/tests/UsingObjectsInSelect.java
+++ b/src/com/vaadin/tests/UsingObjectsInSelect.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests;
+package com.vaadin.tests;
 
 import java.util.LinkedList;
 import java.util.Random;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Window;
 
-public class UsingObjectsInSelect extends com.itmill.toolkit.Application
+public class UsingObjectsInSelect extends com.vaadin.Application
         implements ValueChangeListener {
 
     private final Select select = new Select();
diff --git a/src/com/itmill/toolkit/tests/book/BookTestApplication.java b/src/com/vaadin/tests/book/BookTestApplication.java
index 678f49c7dc..816dd0c902 100644
--- a/src/com/itmill/toolkit/tests/book/BookTestApplication.java
+++ b/src/com/vaadin/tests/book/BookTestApplication.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
 import java.net.URL;
 import java.sql.Connection;
@@ -14,53 +14,53 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.util.QueryContainer;
-import com.itmill.toolkit.data.validator.StringLengthValidator;
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.terminal.StreamResource;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.terminal.gwt.server.WebApplicationContext;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.FormLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.InlineDateField;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.MenuBar;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.PopupDateField;
-import com.itmill.toolkit.ui.ProgressIndicator;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Layout.AlignmentHandler;
-import com.itmill.toolkit.ui.MenuBar.MenuItem;
-
-public class BookTestApplication extends com.itmill.toolkit.Application {
+import com.vaadin.data.Item;
+import com.vaadin.data.Validator;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.data.util.QueryContainer;
+import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.terminal.StreamResource;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.terminal.UserError;
+import com.vaadin.terminal.gwt.server.WebApplicationContext;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.InlineDateField;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.MenuBar;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.PopupDateField;
+import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Layout.AlignmentHandler;
+import com.vaadin.ui.MenuBar.MenuItem;
+
+public class BookTestApplication extends com.vaadin.Application {
 	Window main = new Window("Application window");
 
 	TheButton butts1;
diff --git a/src/com/itmill/toolkit/tests/book/ChatApplication.java b/src/com/vaadin/tests/book/ChatApplication.java
index 5ad52daf2b..a70d9d450f 100644
--- a/src/com/itmill/toolkit/tests/book/ChatApplication.java
+++ b/src/com/vaadin/tests/book/ChatApplication.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ProgressIndicator;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class ChatApplication extends Application implements
         Button.ClickListener {
diff --git a/src/com/itmill/toolkit/tests/book/DefaultButtonExample.java b/src/com/vaadin/tests/book/DefaultButtonExample.java
index 1f340ce4d5..c3d96f1d16 100644
--- a/src/com/itmill/toolkit/tests/book/DefaultButtonExample.java
+++ b/src/com/vaadin/tests/book/DefaultButtonExample.java
@@ -2,18 +2,18 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.event.ShortcutAction;
-import com.itmill.toolkit.event.Action.Handler;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.FormLayout;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.event.Action;
+import com.vaadin.event.ShortcutAction;
+import com.vaadin.event.Action.Handler;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
 
 public class DefaultButtonExample extends CustomComponent implements Handler {
 	// Define and create user interface components
diff --git a/src/com/itmill/toolkit/tests/book/EmbeddedButton.java b/src/com/vaadin/tests/book/EmbeddedButton.java
index 4ec0d3a198..2ed67f0305 100644
--- a/src/com/itmill/toolkit/tests/book/EmbeddedButton.java
+++ b/src/com/vaadin/tests/book/EmbeddedButton.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
+import com.vaadin.terminal.Resource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
 
 public class EmbeddedButton extends CustomComponent implements
         Button.ClickListener {
diff --git a/src/com/itmill/toolkit/tests/book/FormExample.java b/src/com/vaadin/tests/book/FormExample.java
index d0c78c0c54..bd6cfc0e98 100644
--- a/src/com/itmill/toolkit/tests/book/FormExample.java
+++ b/src/com/vaadin/tests/book/FormExample.java
@@ -1,22 +1,22 @@
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
 import java.util.Vector;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.FieldFactory;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Validator;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.FieldFactory;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TextField;
 
 /**
  * This example demonstrates the most important features of the Form component:
diff --git a/src/com/itmill/toolkit/tests/book/FormExample2.java b/src/com/vaadin/tests/book/FormExample2.java
index a1113a1461..2e7e09bdb2 100644
--- a/src/com/itmill/toolkit/tests/book/FormExample2.java
+++ b/src/com/vaadin/tests/book/FormExample2.java
@@ -1,19 +1,19 @@
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
 import java.util.Vector;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.FieldFactory;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.FieldFactory;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TextField;
 
 /**
  * This example demonstrates the most important features of the Form component:
diff --git a/src/com/itmill/toolkit/tests/book/MyDynamicResource.java b/src/com/vaadin/tests/book/MyDynamicResource.java
index 5981a4ffbf..9948bfe731 100644
--- a/src/com/itmill/toolkit/tests/book/MyDynamicResource.java
+++ b/src/com/vaadin/tests/book/MyDynamicResource.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
 import java.awt.Color;
 import java.awt.Graphics;
@@ -11,9 +11,9 @@ import java.util.Map;
 
 import javax.imageio.ImageIO;
 
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.URIHandler;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.terminal.URIHandler;
 
 /**
  * Demonstrates handling URI parameters and the URI itself to create a dynamic
diff --git a/src/com/itmill/toolkit/tests/book/MyUploader.java b/src/com/vaadin/tests/book/MyUploader.java
index 2702bbf087..cc953e79cf 100644
--- a/src/com/itmill/toolkit/tests/book/MyUploader.java
+++ b/src/com/vaadin/tests/book/MyUploader.java
@@ -2,18 +2,18 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 
-import com.itmill.toolkit.terminal.FileResource;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Upload;
+import com.vaadin.terminal.FileResource;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Upload;
 
 public class MyUploader extends CustomComponent implements
         Upload.SucceededListener, Upload.FailedListener, Upload.Receiver {
diff --git a/src/com/itmill/toolkit/tests/book/SSNField.java b/src/com/vaadin/tests/book/SSNField.java
index 2dcb2d5c68..aab6206b4b 100644
--- a/src/com/itmill/toolkit/tests/book/SSNField.java
+++ b/src/com/vaadin/tests/book/SSNField.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
-
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.FormLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
+package com.vaadin.tests.book;
+
+import com.vaadin.data.Property;
+import com.vaadin.data.Validator;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
 
 /* Finnish Social Security Number input field that validates the value. */
 public class SSNField extends CustomComponent implements
diff --git a/src/com/itmill/toolkit/tests/book/SelectExample.java b/src/com/vaadin/tests/book/SelectExample.java
index 7b9cec14cc..f301e85c3f 100644
--- a/src/com/itmill/toolkit/tests/book/SelectExample.java
+++ b/src/com/vaadin/tests/book/SelectExample.java
@@ -2,18 +2,18 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TwinColSelect;
+package com.vaadin.tests.book;
+
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TwinColSelect;
 
 /* Let us add an implementation of the ValueChangeListener interface. */
 public class SelectExample extends CustomComponent implements
diff --git a/src/com/itmill/toolkit/tests/book/TabSheetExample.java b/src/com/vaadin/tests/book/TabSheetExample.java
index 20c9c28785..cd70143ce6 100644
--- a/src/com/itmill/toolkit/tests/book/TabSheetExample.java
+++ b/src/com/vaadin/tests/book/TabSheetExample.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
 
 public class TabSheetExample extends CustomComponent implements
         Button.ClickListener, TabSheet.SelectedTabChangeListener {
diff --git a/src/com/itmill/toolkit/tests/book/TableCellStyle.java b/src/com/vaadin/tests/book/TableCellStyle.java
index ac66c45f81..6f66653d79 100644
--- a/src/com/itmill/toolkit/tests/book/TableCellStyle.java
+++ b/src/com/vaadin/tests/book/TableCellStyle.java
@@ -2,10 +2,10 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Table;
 
 public class TableCellStyle extends CustomComponent {
     public TableCellStyle() {
diff --git a/src/com/itmill/toolkit/tests/book/TableEditable.java b/src/com/vaadin/tests/book/TableEditable.java
index 5941d474ba..78a4b808bd 100644
--- a/src/com/itmill/toolkit/tests/book/TableEditable.java
+++ b/src/com/vaadin/tests/book/TableEditable.java
@@ -2,18 +2,18 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
 
 public class TableEditable extends CustomComponent {
     /* A layout needed for the example. */
diff --git a/src/com/itmill/toolkit/tests/book/TableEditableBean.java b/src/com/vaadin/tests/book/TableEditableBean.java
index fdb052197b..847ff3e935 100644
--- a/src/com/itmill/toolkit/tests/book/TableEditableBean.java
+++ b/src/com/vaadin/tests/book/TableEditableBean.java
@@ -2,24 +2,24 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
 import java.util.Collection;
 import java.util.Vector;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.AbstractField;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.AbstractField;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
 
 /**
  * Shows how to bind a bean to a table and make it editable.
diff --git a/src/com/itmill/toolkit/tests/book/TableExample.java b/src/com/vaadin/tests/book/TableExample.java
index 4d888eaeae..a2cbaa45c2 100644
--- a/src/com/itmill/toolkit/tests/book/TableExample.java
+++ b/src/com/vaadin/tests/book/TableExample.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
 
 public class TableExample extends CustomComponent {
     /* Create the table with a caption. */
diff --git a/src/com/itmill/toolkit/tests/book/TableExample1.java b/src/com/vaadin/tests/book/TableExample1.java
index cf9ad1d438..62b189f4ff 100644
--- a/src/com/itmill/toolkit/tests/book/TableExample1.java
+++ b/src/com/vaadin/tests/book/TableExample1.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
 
 public class TableExample1 extends CustomComponent {
     /* A layout needed for the example. */
diff --git a/src/com/itmill/toolkit/tests/book/TableExample2.java b/src/com/vaadin/tests/book/TableExample2.java
index 3472300123..b2d8b2bc45 100644
--- a/src/com/itmill/toolkit/tests/book/TableExample2.java
+++ b/src/com/vaadin/tests/book/TableExample2.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
 
 public class TableExample2 extends CustomComponent {
     /* A layout needed for the example. */
diff --git a/src/com/itmill/toolkit/tests/book/TableExample3.java b/src/com/vaadin/tests/book/TableExample3.java
index 152d0ed4c9..92ef890c33 100644
--- a/src/com/itmill/toolkit/tests/book/TableExample3.java
+++ b/src/com/vaadin/tests/book/TableExample3.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TableExample3 extends CustomComponent {
     /* A layout needed for the example. */
diff --git a/src/com/itmill/toolkit/tests/book/TableHuge.java b/src/com/vaadin/tests/book/TableHuge.java
index 9553e7cb9e..b3828a5a3b 100644
--- a/src/com/itmill/toolkit/tests/book/TableHuge.java
+++ b/src/com/vaadin/tests/book/TableHuge.java
@@ -2,20 +2,20 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
 import java.util.Collection;
 import java.util.Vector;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Container.Indexed;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.data.util.PropertysetItem;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Container.Indexed;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.data.util.PropertysetItem;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Table;
 
 public class TableHuge extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/book/TheButton.java b/src/com/vaadin/tests/book/TheButton.java
index 56f3054733..716aaa64d7 100644
--- a/src/com/itmill/toolkit/tests/book/TheButton.java
+++ b/src/com/vaadin/tests/book/TheButton.java
@@ -2,10 +2,10 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
 
 public class TheButton extends CustomComponent implements Button.ClickListener {
     Button thebutton;
diff --git a/src/com/itmill/toolkit/tests/book/TheButtons.java b/src/com/vaadin/tests/book/TheButtons.java
index e5a22457ee..ed7ef00cc4 100644
--- a/src/com/itmill/toolkit/tests/book/TheButtons.java
+++ b/src/com/vaadin/tests/book/TheButtons.java
@@ -2,10 +2,10 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.ui.AbstractComponentContainer;
-import com.itmill.toolkit.ui.Button;
+import com.vaadin.ui.AbstractComponentContainer;
+import com.vaadin.ui.Button;
 
 public class TheButtons implements Button.ClickListener {
     Button thebutton;
diff --git a/src/com/itmill/toolkit/tests/book/TheButtons2.java b/src/com/vaadin/tests/book/TheButtons2.java
index a5fc7711ce..c96ed51773 100644
--- a/src/com/itmill/toolkit/tests/book/TheButtons2.java
+++ b/src/com/vaadin/tests/book/TheButtons2.java
@@ -2,10 +2,10 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.ui.AbstractComponentContainer;
-import com.itmill.toolkit.ui.Button;
+import com.vaadin.ui.AbstractComponentContainer;
+import com.vaadin.ui.Button;
 
 public class TheButtons2 {
     Button thebutton;
diff --git a/src/com/itmill/toolkit/tests/book/TheButtons3.java b/src/com/vaadin/tests/book/TheButtons3.java
index 47ee1c5b61..9b77e7855a 100644
--- a/src/com/itmill/toolkit/tests/book/TheButtons3.java
+++ b/src/com/vaadin/tests/book/TheButtons3.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
-import com.itmill.toolkit.ui.AbstractComponentContainer;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.AbstractComponentContainer;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
 
 /** This example demonstrates the use of inline classes for event listeners. */
 public class TheButtons3 {
diff --git a/src/com/itmill/toolkit/tests/book/WindowOpener.java b/src/com/vaadin/tests/book/WindowOpener.java
index e33a53cfbf..f159c48b30 100644
--- a/src/com/itmill/toolkit/tests/book/WindowOpener.java
+++ b/src/com/vaadin/tests/book/WindowOpener.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.book;
-
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Window.CloseEvent;
+package com.vaadin.tests.book;
+
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Window.CloseEvent;
 
 /** Component contains a button that allows opening a window. */
 public class WindowOpener extends CustomComponent implements
diff --git a/src/com/itmill/toolkit/tests/book/WindowTestApplication.java b/src/com/vaadin/tests/book/WindowTestApplication.java
index 0045bcea91..4e80122b96 100644
--- a/src/com/itmill/toolkit/tests/book/WindowTestApplication.java
+++ b/src/com/vaadin/tests/book/WindowTestApplication.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.book;
+package com.vaadin.tests.book;
 
 import java.util.HashMap;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Window.CloseEvent;
+import com.vaadin.Application;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Window.CloseEvent;
 
 public class WindowTestApplication extends Application {
     Window anotherpage = null;
@@ -18,7 +18,7 @@ public class WindowTestApplication extends Application {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.Application#init()
+     * @see com.vaadin.Application#init()
      */
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/book/images/Earth_small.png b/src/com/vaadin/tests/book/images/Earth_small.png
index abe9227914..abe9227914 100644
--- a/src/com/itmill/toolkit/tests/book/images/Earth_small.png
+++ b/src/com/vaadin/tests/book/images/Earth_small.png
diff --git a/src/com/itmill/toolkit/tests/book/images/Earth_symbol.png b/src/com/vaadin/tests/book/images/Earth_symbol.png
index 6060358883..6060358883 100644
--- a/src/com/itmill/toolkit/tests/book/images/Earth_symbol.png
+++ b/src/com/vaadin/tests/book/images/Earth_symbol.png
diff --git a/src/com/itmill/toolkit/tests/book/images/Jupiter_symbol.png b/src/com/vaadin/tests/book/images/Jupiter_symbol.png
index 7a973bec48..7a973bec48 100644
--- a/src/com/itmill/toolkit/tests/book/images/Jupiter_symbol.png
+++ b/src/com/vaadin/tests/book/images/Jupiter_symbol.png
diff --git a/src/com/itmill/toolkit/tests/book/images/Mars_symbol.png b/src/com/vaadin/tests/book/images/Mars_symbol.png
index 7ab7616c75..7ab7616c75 100644
--- a/src/com/itmill/toolkit/tests/book/images/Mars_symbol.png
+++ b/src/com/vaadin/tests/book/images/Mars_symbol.png
diff --git a/src/com/itmill/toolkit/tests/book/images/Mercury_small.png b/src/com/vaadin/tests/book/images/Mercury_small.png
index ef69931a8f..ef69931a8f 100644
--- a/src/com/itmill/toolkit/tests/book/images/Mercury_small.png
+++ b/src/com/vaadin/tests/book/images/Mercury_small.png
diff --git a/src/com/itmill/toolkit/tests/book/images/Mercury_symbol.png b/src/com/vaadin/tests/book/images/Mercury_symbol.png
index 97c09d1b29..97c09d1b29 100644
--- a/src/com/itmill/toolkit/tests/book/images/Mercury_symbol.png
+++ b/src/com/vaadin/tests/book/images/Mercury_symbol.png
diff --git a/src/com/itmill/toolkit/tests/book/images/Neptune_symbol.png b/src/com/vaadin/tests/book/images/Neptune_symbol.png
index 2b84811c80..2b84811c80 100644
--- a/src/com/itmill/toolkit/tests/book/images/Neptune_symbol.png
+++ b/src/com/vaadin/tests/book/images/Neptune_symbol.png
diff --git a/src/com/itmill/toolkit/tests/book/images/Saturn_symbol.png b/src/com/vaadin/tests/book/images/Saturn_symbol.png
index f4b7e5c6ca..f4b7e5c6ca 100644
--- a/src/com/itmill/toolkit/tests/book/images/Saturn_symbol.png
+++ b/src/com/vaadin/tests/book/images/Saturn_symbol.png
diff --git a/src/com/itmill/toolkit/tests/book/images/Uranus_symbol.png b/src/com/vaadin/tests/book/images/Uranus_symbol.png
index 74f755fb97..74f755fb97 100644
--- a/src/com/itmill/toolkit/tests/book/images/Uranus_symbol.png
+++ b/src/com/vaadin/tests/book/images/Uranus_symbol.png
diff --git a/src/com/itmill/toolkit/tests/book/images/Venus_small.png b/src/com/vaadin/tests/book/images/Venus_small.png
index 7bcac3fa4f..7bcac3fa4f 100644
--- a/src/com/itmill/toolkit/tests/book/images/Venus_small.png
+++ b/src/com/vaadin/tests/book/images/Venus_small.png
diff --git a/src/com/itmill/toolkit/tests/book/images/Venus_symbol.png b/src/com/vaadin/tests/book/images/Venus_symbol.png
index 6d08313e5d..6d08313e5d 100644
--- a/src/com/itmill/toolkit/tests/book/images/Venus_symbol.png
+++ b/src/com/vaadin/tests/book/images/Venus_symbol.png
diff --git a/src/com/itmill/toolkit/tests/book/smiley.jpg b/src/com/vaadin/tests/book/smiley.jpg
index dc1a399c76..dc1a399c76 100644
--- a/src/com/itmill/toolkit/tests/book/smiley.jpg
+++ b/src/com/vaadin/tests/book/smiley.jpg
diff --git a/src/com/itmill/toolkit/tests/components/CustomComponentwithUndefinedSize.java b/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
index 4c8619f92e..6b3daae539 100644
--- a/src/com/itmill/toolkit/tests/components/CustomComponentwithUndefinedSize.java
+++ b/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.components;
+package com.vaadin.tests.components;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class CustomComponentwithUndefinedSize extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/MultipleDebugIds.java b/src/com/vaadin/tests/components/MultipleDebugIds.java
index db5ba15111..ebfa29b9e9 100644
--- a/src/com/itmill/toolkit/tests/components/MultipleDebugIds.java
+++ b/src/com/vaadin/tests/components/MultipleDebugIds.java
@@ -1,7 +1,7 @@
-package com.itmill.toolkit.tests.components;
+package com.vaadin.tests.components;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
 
 public class MultipleDebugIds extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/TestBase.java b/src/com/vaadin/tests/components/TestBase.java
index c6352aa276..45cc69516d 100644
--- a/src/com/itmill/toolkit/tests/components/TestBase.java
+++ b/src/com/vaadin/tests/components/TestBase.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.components;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.components;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
 
 public abstract class TestBase extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/components/absolutelayout/AbsoluteLayoutClipping.java b/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
index b43d005274..f6bff579a3 100644
--- a/src/com/itmill/toolkit/tests/components/absolutelayout/AbsoluteLayoutClipping.java
+++ b/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.components.absolutelayout;
+package com.vaadin.tests.components.absolutelayout;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.AbsoluteLayout;
-import com.itmill.toolkit.ui.Label;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.AbsoluteLayout;
+import com.vaadin.ui.Label;
 
 public class AbsoluteLayoutClipping extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java b/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
index 524fe272f8..69705d4143 100644
--- a/src/com/itmill/toolkit/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
+++ b/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.components.abstractfield;
+package com.vaadin.tests.components.abstractfield;
 
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.data.validator.StringLengthValidator;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Window.Notification;
 
 public class AbstractFieldCommitWithInvalidValues extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/accordion/RemoveTabs.java b/src/com/vaadin/tests/components/accordion/RemoveTabs.java
index 0812cc3e3b..a345ad61a2 100644
--- a/src/com/itmill/toolkit/tests/components/accordion/RemoveTabs.java
+++ b/src/com/vaadin/tests/components/accordion/RemoveTabs.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.components.accordion;
+package com.vaadin.tests.components.accordion;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.AbstractComponentContainer;
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.AbstractComponentContainer;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class RemoveTabs extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/beanitemcontainer/BeanItemContainerGenerator.java b/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
index b08f317f3c..5a42599005 100644
--- a/src/com/itmill/toolkit/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
+++ b/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.components.beanitemcontainer;
+package com.vaadin.tests.components.beanitemcontainer;
 
 import java.util.Date;
 import java.util.Random;
 
-import com.itmill.toolkit.data.util.BeanItemContainer;
+import com.vaadin.data.util.BeanItemContainer;
 
 public class BeanItemContainerGenerator {
 
diff --git a/src/com/itmill/toolkit/tests/components/beanitemcontainer/BeanItemContainerNullValues.java b/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
index c64768975e..15f292a6ca 100644
--- a/src/com/itmill/toolkit/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
+++ b/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.components.beanitemcontainer;
+package com.vaadin.tests.components.beanitemcontainer;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class BeanItemContainerNullValues extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java b/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
index b01197c759..20becea974 100644
--- a/src/com/itmill/toolkit/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
+++ b/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.components.beanitemcontainer;
+package com.vaadin.tests.components.beanitemcontainer;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.itmill.toolkit.data.util.BeanItemContainer;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.util.BeanItemContainer;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Table;
 
 public class TestBeanItemContainerUsage extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/checkbox/CheckboxIcon.java b/src/com/vaadin/tests/components/checkbox/CheckboxIcon.java
index 4cf1cf2833..b38348e45f 100644
--- a/src/com/itmill/toolkit/tests/components/checkbox/CheckboxIcon.java
+++ b/src/com/vaadin/tests/components/checkbox/CheckboxIcon.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.components.checkbox;
+package com.vaadin.tests.components.checkbox;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.CheckBox;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.CheckBox;
 
 public class CheckboxIcon extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/combobox/ComboBoxInPopupView.java b/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
index 64efb50c91..9636af0284 100644
--- a/src/com/itmill/toolkit/tests/components/combobox/ComboBoxInPopupView.java
+++ b/src/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.combobox;
+package com.vaadin.tests.components.combobox;
 
 import java.util.Map;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.PopupView;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.PopupView;
 
 public class ComboBoxInPopupView extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/combobox/ComboBoxItemIcon.java b/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
index ed0f2aa821..905e9a37c3 100644
--- a/src/com/itmill/toolkit/tests/components/combobox/ComboBoxItemIcon.java
+++ b/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.combobox;
+package com.vaadin.tests.components.combobox;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.ComboBox;
+import com.vaadin.data.Item;
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.terminal.Resource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.ComboBox;
 
 public class ComboBoxItemIcon extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/combobox/ComboBoxLargeIcons.java b/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
index ccb920e918..1992c12943 100644
--- a/src/com/itmill/toolkit/tests/components/combobox/ComboBoxLargeIcons.java
+++ b/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.components.combobox;
+package com.vaadin.tests.components.combobox;
 
 import java.util.Date;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.ComboBox;
+import com.vaadin.data.Item;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.ComboBox;
 
 public class ComboBoxLargeIcons extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/combobox/ComboBoxNavigation.java b/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
index 85b1bb11f6..245fc123df 100644
--- a/src/com/itmill/toolkit/tests/components/combobox/ComboBoxNavigation.java
+++ b/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
@@ -1,7 +1,7 @@
-package com.itmill.toolkit.tests.components.combobox;
+package com.vaadin.tests.components.combobox;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.ComboBox;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.ComboBox;
 
 public class ComboBoxNavigation extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/combobox/ComboBoxValueUpdate.java b/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
index 697beaadac..c84179aaf0 100644
--- a/src/com/itmill/toolkit/tests/components/combobox/ComboBoxValueUpdate.java
+++ b/src/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.combobox;
+package com.vaadin.tests.components.combobox;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Label;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Label;
 
 public class ComboBoxValueUpdate extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/combobox/fi.gif b/src/com/vaadin/tests/components/combobox/fi.gif
index 8d3a191828..8d3a191828 100755
--- a/src/com/itmill/toolkit/tests/components/combobox/fi.gif
+++ b/src/com/vaadin/tests/components/combobox/fi.gif
diff --git a/src/com/itmill/toolkit/tests/components/combobox/se.gif b/src/com/vaadin/tests/components/combobox/se.gif
index 80f6285228..80f6285228 100755
--- a/src/com/itmill/toolkit/tests/components/combobox/se.gif
+++ b/src/com/vaadin/tests/components/combobox/se.gif
diff --git a/src/com/itmill/toolkit/tests/components/datefield/TestDatefieldYear.java b/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java
index 5be49c1b0c..fb1a1934c2 100644
--- a/src/com/itmill/toolkit/tests/components/datefield/TestDatefieldYear.java
+++ b/src/com/vaadin/tests/components/datefield/TestDatefieldYear.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.components.datefield;
+package com.vaadin.tests.components.datefield;
 
 import java.util.Date;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.DateField;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.DateField;
 
 public class TestDatefieldYear extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/embedded/EmbeddedImageRefresh.java b/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
index db7f8b3467..e2b4ca5a2e 100644
--- a/src/com/itmill/toolkit/tests/components/embedded/EmbeddedImageRefresh.java
+++ b/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.tests.components.embedded;
+package com.vaadin.tests.components.embedded;
 
 import java.awt.Color;
 import java.awt.Graphics;
@@ -11,11 +11,11 @@ import java.util.Date;
 
 import javax.imageio.ImageIO;
 
-import com.itmill.toolkit.terminal.StreamResource;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.terminal.StreamResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class EmbeddedImageRefresh extends TestBase {
     @Override
diff --git a/src/com/itmill/toolkit/tests/components/embedded/EmbeddedTooltip.java b/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
index f7644666ec..6ce788f262 100644
--- a/src/com/itmill/toolkit/tests/components/embedded/EmbeddedTooltip.java
+++ b/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.components.embedded;
+package com.vaadin.tests.components.embedded;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Embedded;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Embedded;
 
 public class EmbeddedTooltip extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/form/FormCommitWithInvalidValues.java b/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
index 77ec4b3a15..6431e0aeb1 100644
--- a/src/com/itmill/toolkit/tests/components/form/FormCommitWithInvalidValues.java
+++ b/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.components.form;
+package com.vaadin.tests.components.form;
 
-import com.itmill.toolkit.data.validator.StringLengthValidator;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Window.Notification;
 
 public class FormCommitWithInvalidValues extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/form/FormRenderingFlicker.java b/src/com/vaadin/tests/components/form/FormRenderingFlicker.java
index f670aa7d23..6956eee017 100644
--- a/src/com/itmill/toolkit/tests/components/form/FormRenderingFlicker.java
+++ b/src/com/vaadin/tests/components/form/FormRenderingFlicker.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.components.form;
+package com.vaadin.tests.components.form;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.event.ItemClickEvent;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickListener;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.data.Item;
+import com.vaadin.event.ItemClickEvent;
+import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
 
 public class FormRenderingFlicker extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/label/HundredPercentWideLabelResize.java b/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
index f12f28ad3a..d494ac176e 100644
--- a/src/com/itmill/toolkit/tests/components/label/HundredPercentWideLabelResize.java
+++ b/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.components.label;
+package com.vaadin.tests.components.label;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class HundredPercentWideLabelResize extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/label/LabelWrapping.java b/src/com/vaadin/tests/components/label/LabelWrapping.java
index 0ced6cc22c..d702f2440d 100644
--- a/src/com/itmill/toolkit/tests/components/label/LabelWrapping.java
+++ b/src/com/vaadin/tests/components/label/LabelWrapping.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.label;
+package com.vaadin.tests.components.label;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class LabelWrapping extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/link/LinkIcon.java b/src/com/vaadin/tests/components/link/LinkIcon.java
index e6e8502f06..345dcf93b4 100644
--- a/src/com/itmill/toolkit/tests/components/link/LinkIcon.java
+++ b/src/com/vaadin/tests/components/link/LinkIcon.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.components.link;
+package com.vaadin.tests.components.link;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Link;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Link;
 
 public class LinkIcon extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/link/LinkTargetSize.java b/src/com/vaadin/tests/components/link/LinkTargetSize.java
index 7d36939b40..d5542cab04 100644
--- a/src/com/itmill/toolkit/tests/components/link/LinkTargetSize.java
+++ b/src/com/vaadin/tests/components/link/LinkTargetSize.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.components.link;
+package com.vaadin.tests.components.link;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Link;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Link;
 
 public class LinkTargetSize extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/richtextarea/RichTextAreaSize.java b/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
index b9bdfc5107..b41b192056 100644
--- a/src/com/itmill/toolkit/tests/components/richtextarea/RichTextAreaSize.java
+++ b/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.components.richtextarea;
+package com.vaadin.tests.components.richtextarea;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.VerticalLayout;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.VerticalLayout;
 
 public class RichTextAreaSize extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/splitpanel/SplitPanelSplitterWidth.java b/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
index 22b073aa73..89008754ba 100644
--- a/src/com/itmill/toolkit/tests/components/splitpanel/SplitPanelSplitterWidth.java
+++ b/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.components.splitpanel;
+package com.vaadin.tests.components.splitpanel;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.Notification;
 
 public class SplitPanelSplitterWidth extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/ColumnExpandRatio.java b/src/com/vaadin/tests/components/table/ColumnExpandRatio.java
index 94c2c5c4fc..be176d83fa 100644
--- a/src/com/itmill/toolkit/tests/components/table/ColumnExpandRatio.java
+++ b/src/com/vaadin/tests/components/table/ColumnExpandRatio.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.table;
+package com.vaadin.tests.components.table;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
 
 public class ColumnExpandRatio extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/ColumnGeneratorAddingOrder.java b/src/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
index 7f3c1d18d6..d3dfa61ceb 100644
--- a/src/com/itmill/toolkit/tests/components/table/ColumnGeneratorAddingOrder.java
+++ b/src/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.table;
+package com.vaadin.tests.components.table;
 
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
 
 public class ColumnGeneratorAddingOrder extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/ColumnWidths.java b/src/com/vaadin/tests/components/table/ColumnWidths.java
index 1d7f9cc6fc..9fe7a98179 100644
--- a/src/com/itmill/toolkit/tests/components/table/ColumnWidths.java
+++ b/src/com/vaadin/tests/components/table/ColumnWidths.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.table;
+package com.vaadin.tests.components.table;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
 
 public class ColumnWidths extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/ContainerSizeChange.java b/src/com/vaadin/tests/components/table/ContainerSizeChange.java
index b7356fca5b..567cde8a54 100644
--- a/src/com/itmill/toolkit/tests/components/table/ContainerSizeChange.java
+++ b/src/com/vaadin/tests/components/table/ContainerSizeChange.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.components.table;
-
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.components.table;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class ContainerSizeChange extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/LabelEmbeddedClickThroughForTable.java b/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
index 790861e3fd..139e9baa35 100644
--- a/src/com/itmill/toolkit/tests/components/table/LabelEmbeddedClickThroughForTable.java
+++ b/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.components.table;
+package com.vaadin.tests.components.table;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.event.ItemClickEvent;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickListener;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Item;
+import com.vaadin.event.ItemClickEvent;
+import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
 
 public class LabelEmbeddedClickThroughForTable extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/PropertyValueChange.java b/src/com/vaadin/tests/components/table/PropertyValueChange.java
index d767808e50..353d2f13ef 100644
--- a/src/com/itmill/toolkit/tests/components/table/PropertyValueChange.java
+++ b/src/com/vaadin/tests/components/table/PropertyValueChange.java
@@ -1,21 +1,21 @@
-package com.itmill.toolkit.tests.components.table;
-
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.FieldFactory;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.AbstractSelect.NewItemHandler;
-import com.itmill.toolkit.ui.Table.ColumnGenerator;
+package com.vaadin.tests.components.table;
+
+import com.vaadin.data.Container;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.FieldFactory;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.AbstractSelect.NewItemHandler;
+import com.vaadin.ui.Table.ColumnGenerator;
 
 public class PropertyValueChange extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/RowAdditionTest.java b/src/com/vaadin/tests/components/table/RowAdditionTest.java
index b01abd62c0..9b600eff7a 100644
--- a/src/com/itmill/toolkit/tests/components/table/RowAdditionTest.java
+++ b/src/com/vaadin/tests/components/table/RowAdditionTest.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.components.table;
-
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.components.table;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class RowAdditionTest extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/TableItemIcon.java b/src/com/vaadin/tests/components/table/TableItemIcon.java
index eb296da8ad..b8a6733e83 100644
--- a/src/com/itmill/toolkit/tests/components/table/TableItemIcon.java
+++ b/src/com/vaadin/tests/components/table/TableItemIcon.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.table;
+package com.vaadin.tests.components.table;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Item;
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.terminal.Resource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Table;
 
 public class TableItemIcon extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/TableRowHeight.java b/src/com/vaadin/tests/components/table/TableRowHeight.java
index 11b4ea8713..7e51226094 100644
--- a/src/com/itmill/toolkit/tests/components/table/TableRowHeight.java
+++ b/src/com/vaadin/tests/components/table/TableRowHeight.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.components.table;
-
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Table.ColumnGenerator;
+package com.vaadin.tests.components.table;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Table.ColumnGenerator;
 
 public class TableRowHeight extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/TableRowHeight2.java b/src/com/vaadin/tests/components/table/TableRowHeight2.java
index dc366e40fe..2c9d75808b 100644
--- a/src/com/itmill/toolkit/tests/components/table/TableRowHeight2.java
+++ b/src/com/vaadin/tests/components/table/TableRowHeight2.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.table;
+package com.vaadin.tests.components.table;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Item;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Table;
 
 public class TableRowHeight2 extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/TableRowHeight3.java b/src/com/vaadin/tests/components/table/TableRowHeight3.java
index 56f4289605..d0b7afe94c 100644
--- a/src/com/itmill/toolkit/tests/components/table/TableRowHeight3.java
+++ b/src/com/vaadin/tests/components/table/TableRowHeight3.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.table;
+package com.vaadin.tests.components.table;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.data.Item;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Table;
 
 public class TableRowHeight3 extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/table/TestCurrentPageFirstItem.java b/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
index fd4aed015d..d74c3b7238 100644
--- a/src/com/itmill/toolkit/tests/components/table/TestCurrentPageFirstItem.java
+++ b/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.components.table;
+package com.vaadin.tests.components.table;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.Application;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class TestCurrentPageFirstItem extends Application implements
         ClickListener {
diff --git a/src/com/itmill/toolkit/tests/components/table/fi.gif b/src/com/vaadin/tests/components/table/fi.gif
index 8d3a191828..8d3a191828 100755
--- a/src/com/itmill/toolkit/tests/components/table/fi.gif
+++ b/src/com/vaadin/tests/components/table/fi.gif
diff --git a/src/com/itmill/toolkit/tests/components/table/se.gif b/src/com/vaadin/tests/components/table/se.gif
index 80f6285228..80f6285228 100755
--- a/src/com/itmill/toolkit/tests/components/table/se.gif
+++ b/src/com/vaadin/tests/components/table/se.gif
diff --git a/src/com/itmill/toolkit/tests/components/tabsheet/AddAndRemoveTabs.java b/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
index 2962905578..44859fb511 100644
--- a/src/com/itmill/toolkit/tests/components/tabsheet/AddAndRemoveTabs.java
+++ b/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.tabsheet;
+package com.vaadin.tests.components.tabsheet;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class AddAndRemoveTabs extends TestBase {
     private TabSheet tabSheet;
diff --git a/src/com/itmill/toolkit/tests/components/tabsheet/RemoveTabs.java b/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java
index 32a46d82f1..c2f8af8454 100644
--- a/src/com/itmill/toolkit/tests/components/tabsheet/RemoveTabs.java
+++ b/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.components.tabsheet;
+package com.vaadin.tests.components.tabsheet;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.AbstractComponentContainer;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.AbstractComponentContainer;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class RemoveTabs extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/tabsheet/TabSheetCaptions.java b/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
index d1b13ca00d..9e8f4a35f4 100644
--- a/src/com/itmill/toolkit/tests/components/tabsheet/TabSheetCaptions.java
+++ b/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.components.tabsheet;
+package com.vaadin.tests.components.tabsheet;
 
 import java.util.Date;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TabSheetCaptions extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/tabsheet/TabSheetDisabling.java b/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
index ecac170c3c..612960f2cf 100644
--- a/src/com/itmill/toolkit/tests/components/tabsheet/TabSheetDisabling.java
+++ b/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.components.tabsheet;
+package com.vaadin.tests.components.tabsheet;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class TabSheetDisabling extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/tabsheet/TabSheetIcons.java b/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
index 4c61da7548..c295f1a9e5 100644
--- a/src/com/itmill/toolkit/tests/components/tabsheet/TabSheetIcons.java
+++ b/src/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.components.tabsheet;
-
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.TextField;
+package com.vaadin.tests.components.tabsheet;
+
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TextField;
 
 public class TabSheetIcons extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/tabsheet/VerticalScrollbarPosition.java b/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
index 65e399eff6..a94aa1cd47 100644
--- a/src/com/itmill/toolkit/tests/components/tabsheet/VerticalScrollbarPosition.java
+++ b/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.components.tabsheet;
+package com.vaadin.tests.components.tabsheet;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TextField;
 
 public class VerticalScrollbarPosition extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/window/CenteredWindowWithUndefinedSize.java b/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
index 3c0191ff39..51b6568f94 100644
--- a/src/com/itmill/toolkit/tests/components/window/CenteredWindowWithUndefinedSize.java
+++ b/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.components.window;
+package com.vaadin.tests.components.window;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 public class CenteredWindowWithUndefinedSize extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/window/EmbeddedInSubWindow.java b/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
index cb9d8d095d..0c6f375645 100644
--- a/src/com/itmill/toolkit/tests/components/window/EmbeddedInSubWindow.java
+++ b/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.components.window;
+package com.vaadin.tests.components.window;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Window;
 
 public class EmbeddedInSubWindow extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/window/TestTooSmallSubwindowSize.java b/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
index 47f8309da3..859c1b4b5d 100644
--- a/src/com/itmill/toolkit/tests/components/window/TestTooSmallSubwindowSize.java
+++ b/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.components.window;
+package com.vaadin.tests.components.window;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 public class TestTooSmallSubwindowSize extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/components/window/WindowResizeListener.java b/src/com/vaadin/tests/components/window/WindowResizeListener.java
index 63956d524f..0ba87336f6 100644
--- a/src/com/itmill/toolkit/tests/components/window/WindowResizeListener.java
+++ b/src/com/vaadin/tests/components/window/WindowResizeListener.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.components.window;
-
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.ResizeEvent;
-import com.itmill.toolkit.ui.Window.ResizeListener;
+package com.vaadin.tests.components.window;
+
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.ResizeEvent;
+import com.vaadin.ui.Window.ResizeListener;
 
 public class WindowResizeListener extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/containers/BeanItemContainerFilteringTest.java b/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
index be3f8b1861..e4b65d5676 100644
--- a/src/com/itmill/toolkit/tests/containers/BeanItemContainerFilteringTest.java
+++ b/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.containers;
-
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.BeanItemContainer;
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.containers;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.util.BeanItemContainer;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class BeanItemContainerFilteringTest extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/containers/BeanItemContainerTest.java b/src/com/vaadin/tests/containers/BeanItemContainerTest.java
index bbfc72fb02..905ec2f9ff 100644
--- a/src/com/itmill/toolkit/tests/containers/BeanItemContainerTest.java
+++ b/src/com/vaadin/tests/containers/BeanItemContainerTest.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.containers;
+package com.vaadin.tests.containers;
 
 import java.util.Collection;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.util.BeanItemContainer;
+import com.vaadin.data.util.BeanItemContainer;
 
 public class BeanItemContainerTest {
 
diff --git a/src/com/itmill/toolkit/tests/containers/IndexedContainerFilteringTest.java b/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
index 00cb1e3355..d66435bdaa 100644
--- a/src/com/itmill/toolkit/tests/containers/IndexedContainerFilteringTest.java
+++ b/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.containers;
-
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.containers;
+
+import com.vaadin.data.Item;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class IndexedContainerFilteringTest extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/Feature.java b/src/com/vaadin/tests/featurebrowser/Feature.java
index a2aa848fb0..4ec1444d29 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/Feature.java
+++ b/src/com/vaadin/tests/featurebrowser/Feature.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
-
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TabSheet;
+package com.vaadin.tests.featurebrowser;
+
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.terminal.Resource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TabSheet;
 
 public abstract class Feature extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java b/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java
index 2481336b8f..f27af4ee9e 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureBrowser.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java
@@ -2,23 +2,23 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
 import java.util.Iterator;
 import java.util.StringTokenizer;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.data.Property;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class FeatureBrowser extends CustomComponent implements
         Property.ValueChangeListener, ClickListener, Layout {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureBuffering.java b/src/com/vaadin/tests/featurebrowser/FeatureBuffering.java
index 5c20b9122c..ac155f2178 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureBuffering.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureBuffering.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class FeatureBuffering extends Feature {
 
@@ -71,7 +71,7 @@ public class FeatureBuffering extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureButton.java b/src/com/vaadin/tests/featurebrowser/FeatureButton.java
index 0f9624737e..425dfff097 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureButton.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureButton.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
 
 public class FeatureButton extends Feature {
 
@@ -45,7 +45,7 @@ public class FeatureButton extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureContainers.java b/src/com/vaadin/tests/featurebrowser/FeatureContainers.java
index 8fae3b40db..b2ee0e21ef 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureContainers.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureContainers.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
-
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+package com.vaadin.tests.featurebrowser;
+
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class FeatureContainers extends Feature {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureCustomLayout.java b/src/com/vaadin/tests/featurebrowser/FeatureCustomLayout.java
index 158a58d167..97ce9761a1 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureCustomLayout.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureCustomLayout.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
-
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+package com.vaadin.tests.featurebrowser;
+
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class FeatureCustomLayout extends Feature {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureDateField.java b/src/com/vaadin/tests/featurebrowser/FeatureDateField.java
index efd324e95b..1f42356a52 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureDateField.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureDateField.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
 import java.util.Locale;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
 
 public class FeatureDateField extends Feature {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java b/src/com/vaadin/tests/featurebrowser/FeatureEmbedded.java
index da2c13c060..834cf11833 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureEmbedded.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureEmbedded.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.OrderedLayout;
 
 public class FeatureEmbedded extends Feature {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureForm.java b/src/com/vaadin/tests/featurebrowser/FeatureForm.java
index 72fd2d81e1..f50ad70ffc 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureForm.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureForm.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
 import java.util.Date;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.data.Property;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TextField;
 
 public class FeatureForm extends Feature implements
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java b/src/com/vaadin/tests/featurebrowser/FeatureGridLayout.java
index 5856395fa2..297248001e 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureGridLayout.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureGridLayout.java
@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
 import java.util.Date;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
 
 public class FeatureGridLayout extends Feature {
 
@@ -57,7 +57,7 @@ public class FeatureGridLayout extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureItems.java b/src/com/vaadin/tests/featurebrowser/FeatureItems.java
index b6ac096614..00e06deafd 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureItems.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureItems.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class FeatureItems extends Feature {
 
@@ -67,7 +67,7 @@ public class FeatureItems extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java b/src/com/vaadin/tests/featurebrowser/FeatureLabel.java
index e489891f13..e3e02eed47 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureLabel.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureLabel.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
 
 public class FeatureLabel extends Feature {
 
@@ -48,7 +48,7 @@ public class FeatureLabel extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureLink.java b/src/com/vaadin/tests/featurebrowser/FeatureLink.java
index 5a135e03d3..2e985c95e3 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureLink.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureLink.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.OrderedLayout;
 
 public class FeatureLink extends Feature {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureOrderedLayout.java b/src/com/vaadin/tests/featurebrowser/FeatureOrderedLayout.java
index cc0ca982d7..1ef07a6878 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureOrderedLayout.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureOrderedLayout.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TextField;
 
 public class FeatureOrderedLayout extends Feature {
 
@@ -54,7 +54,7 @@ public class FeatureOrderedLayout extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeaturePanel.java b/src/com/vaadin/tests/featurebrowser/FeaturePanel.java
index 21006c7ecf..a12e51cae2 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeaturePanel.java
+++ b/src/com/vaadin/tests/featurebrowser/FeaturePanel.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
-
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+package com.vaadin.tests.featurebrowser;
+
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class FeaturePanel extends Feature {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureParameters.java b/src/com/vaadin/tests/featurebrowser/FeatureParameters.java
index 2727a1dee7..4bb90e02b0 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureParameters.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureParameters.java
@@ -2,24 +2,24 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
 import java.net.URL;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Table;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Table;
 
 public class FeatureParameters extends Feature implements URIHandler,
         ParameterHandler {
@@ -112,7 +112,7 @@ public class FeatureParameters extends Feature implements URIHandler,
     /**
      * Add URI and parametes handlers to window.
      * 
-     * @see com.itmill.toolkit.ui.Component#attach()
+     * @see com.vaadin.ui.Component#attach()
      */
     @Override
     public void attach() {
@@ -124,7 +124,7 @@ public class FeatureParameters extends Feature implements URIHandler,
     /**
      * Remove all handlers from window
      * 
-     * @see com.itmill.toolkit.ui.Component#detach()
+     * @see com.vaadin.ui.Component#detach()
      */
     @Override
     public void detach() {
@@ -136,7 +136,7 @@ public class FeatureParameters extends Feature implements URIHandler,
     /**
      * Update URI
      * 
-     * @see com.itmill.toolkit.terminal.URIHandler#handleURI(URL, String)
+     * @see com.vaadin.terminal.URIHandler#handleURI(URL, String)
      */
     public DownloadStream handleURI(URL context, String relativeUri) {
         this.context.setValue(context.toString());
@@ -147,7 +147,7 @@ public class FeatureParameters extends Feature implements URIHandler,
     /**
      * Update parameters table
      * 
-     * @see com.itmill.toolkit.terminal.ParameterHandler#handleParameters(Map)
+     * @see com.vaadin.terminal.ParameterHandler#handleParameters(Map)
      */
     public void handleParameters(Map parameters) {
         params.removeAllItems();
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureProperties.java b/src/com/vaadin/tests/featurebrowser/FeatureProperties.java
index f6e64e4fee..640f4910a9 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureProperties.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureProperties.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
-
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+package com.vaadin.tests.featurebrowser;
+
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class FeatureProperties extends Feature {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureSelect.java b/src/com/vaadin/tests/featurebrowser/FeatureSelect.java
index 9b118c3fd7..d38815e960 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureSelect.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureSelect.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
 
 public class FeatureSelect extends Feature {
 
@@ -60,7 +60,7 @@ public class FeatureSelect extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTabSheet.java b/src/com/vaadin/tests/featurebrowser/FeatureTabSheet.java
index ad9d6a9e59..5dd686e60e 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTabSheet.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureTabSheet.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TabSheet;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TabSheet;
 
 public class FeatureTabSheet extends Feature {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTable.java b/src/com/vaadin/tests/featurebrowser/FeatureTable.java
index 3404c05c44..ecc000320b 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTable.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureTable.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
-
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Table;
+package com.vaadin.tests.featurebrowser;
+
+import com.vaadin.event.Action;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Table;
 
 public class FeatureTable extends Feature implements Action.Handler {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTextField.java b/src/com/vaadin/tests/featurebrowser/FeatureTextField.java
index c3d2c75a87..585193db74 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTextField.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureTextField.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
 
 public class FeatureTextField extends Feature {
 
@@ -44,7 +44,7 @@ public class FeatureTextField extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTree.java b/src/com/vaadin/tests/featurebrowser/FeatureTree.java
index 51c58e49a9..ea80330dbf 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureTree.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureTree.java
@@ -2,17 +2,17 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
 import java.util.Iterator;
 
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Tree;
+import com.vaadin.event.Action;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Tree;
 
 public class FeatureTree extends Feature implements Action.Handler {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureUpload.java b/src/com/vaadin/tests/featurebrowser/FeatureUpload.java
index e08a810056..2dd586d7b8 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureUpload.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureUpload.java
@@ -2,21 +2,21 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import com.itmill.toolkit.terminal.StreamResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Upload;
-import com.itmill.toolkit.ui.Upload.FinishedEvent;
+import com.vaadin.terminal.StreamResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Upload;
+import com.vaadin.ui.Upload.FinishedEvent;
 
 public class FeatureUpload extends Feature implements Upload.FinishedListener {
     Buffer buffer = new Buffer();
@@ -118,7 +118,7 @@ public class FeatureUpload extends Feature implements Upload.FinishedListener {
         }
 
         /**
-         * @see com.itmill.toolkit.ui.Upload.Receiver#receiveUpload(String,
+         * @see com.vaadin.ui.Upload.Receiver#receiveUpload(String,
          *      String)
          */
         public OutputStream receiveUpload(String filename, String MIMEType) {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureUtil.java b/src/com/vaadin/tests/featurebrowser/FeatureUtil.java
index 6ff7e9d447..077ee4fbe5 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureUtil.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureUtil.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureValidators.java b/src/com/vaadin/tests/featurebrowser/FeatureValidators.java
index 6ade71272b..2f268370bd 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureValidators.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureValidators.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class FeatureValidators extends Feature {
 
@@ -67,7 +67,7 @@ public class FeatureValidators extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java b/src/com/vaadin/tests/featurebrowser/FeatureWindow.java
index ea22642705..443a32eb88 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeatureWindow.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureWindow.java
@@ -2,15 +2,15 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
-
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Window.CloseEvent;
+package com.vaadin.tests.featurebrowser;
+
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Window.CloseEvent;
 
 public class FeatureWindow extends Feature implements Window.CloseListener {
 
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/FeaturesApplication.java b/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java
index 2f76a00f9f..69a4192fca 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/FeaturesApplication.java
+++ b/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Window;
 
-public class FeaturesApplication extends com.itmill.toolkit.Application {
+public class FeaturesApplication extends com.vaadin.Application {
 
     @Override
     public void init() {
@@ -25,7 +25,7 @@ public class FeaturesApplication extends com.itmill.toolkit.Application {
      */
     @Override
     public void terminalError(
-            com.itmill.toolkit.terminal.Terminal.ErrorEvent event) {
+            com.vaadin.terminal.Terminal.ErrorEvent event) {
         final Throwable e = event.getThrowable();
         FeatureUtil.debug(getUser().toString(), "terminalError: "
                 + e.toString());
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroBasic.java b/src/com/vaadin/tests/featurebrowser/IntroBasic.java
index a1073840f0..5d480c106a 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/IntroBasic.java
+++ b/src/com/vaadin/tests/featurebrowser/IntroBasic.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class IntroBasic extends Feature {
 
@@ -59,7 +59,7 @@ public class IntroBasic extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroComponents.java b/src/com/vaadin/tests/featurebrowser/IntroComponents.java
index 04869e4d5e..c4898a7fcc 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/IntroComponents.java
+++ b/src/com/vaadin/tests/featurebrowser/IntroComponents.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class IntroComponents extends Feature {
 
@@ -63,7 +63,7 @@ public class IntroComponents extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroDataHandling.java b/src/com/vaadin/tests/featurebrowser/IntroDataHandling.java
index be1a730de1..d164442d4c 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/IntroDataHandling.java
+++ b/src/com/vaadin/tests/featurebrowser/IntroDataHandling.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class IntroDataHandling extends Feature {
 
@@ -57,7 +57,7 @@ public class IntroDataHandling extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroDataModel.java b/src/com/vaadin/tests/featurebrowser/IntroDataModel.java
index d245a7e888..ccfd33b9c9 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/IntroDataModel.java
+++ b/src/com/vaadin/tests/featurebrowser/IntroDataModel.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class IntroDataModel extends Feature {
 
@@ -60,7 +60,7 @@ public class IntroDataModel extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroItemContainers.java b/src/com/vaadin/tests/featurebrowser/IntroItemContainers.java
index 8eac95c269..db9909946c 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/IntroItemContainers.java
+++ b/src/com/vaadin/tests/featurebrowser/IntroItemContainers.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class IntroItemContainers extends Feature {
 
@@ -59,7 +59,7 @@ public class IntroItemContainers extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroLayouts.java b/src/com/vaadin/tests/featurebrowser/IntroLayouts.java
index 4b1990961a..bd180a860c 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/IntroLayouts.java
+++ b/src/com/vaadin/tests/featurebrowser/IntroLayouts.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class IntroLayouts extends Feature {
 
@@ -61,7 +61,7 @@ public class IntroLayouts extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroTerminal.java b/src/com/vaadin/tests/featurebrowser/IntroTerminal.java
index 8a197af197..8bb4a3f145 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/IntroTerminal.java
+++ b/src/com/vaadin/tests/featurebrowser/IntroTerminal.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
 
 public class IntroTerminal extends Feature {
 
@@ -35,7 +35,7 @@ public class IntroTerminal extends Feature {
     }
 
     /**
-     * @see com.itmill.toolkit.tests.featurebrowser.Feature#getDescriptionXHTML()
+     * @see com.vaadin.tests.featurebrowser.Feature#getDescriptionXHTML()
      */
     @Override
     protected String getDescriptionXHTML() {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java b/src/com/vaadin/tests/featurebrowser/IntroWelcome.java
index 1670ed0dd8..b2147cd118 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/IntroWelcome.java
+++ b/src/com/vaadin/tests/featurebrowser/IntroWelcome.java
@@ -2,23 +2,23 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
 import java.net.URL;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.terminal.gwt.server.ApplicationServlet;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.terminal.gwt.server.ApplicationServlet;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 public class IntroWelcome extends Feature implements URIHandler,
         ParameterHandler {
@@ -94,9 +94,9 @@ public class IntroWelcome extends Feature implements URIHandler,
     @Override
     protected String getExampleSrc() {
         return ""
-                + "package com.itmill.toolkit.demo;\n"
-                + "import com.itmill.toolkit.ui.*;\n\n"
-                + "public class HelloWorld extends com.itmill.toolkit.Application {\n"
+                + "package com.vaadin.demo;\n"
+                + "import com.vaadin.ui.*;\n\n"
+                + "public class HelloWorld extends com.vaadin.Application {\n"
                 + "    public void init() {\n"
                 + "        Window main = new Window(\"Hello window\");\n"
                 + "        setMainWindow(main);\n"
@@ -123,7 +123,7 @@ public class IntroWelcome extends Feature implements URIHandler,
     /**
      * Add URI and parametes handlers to window.
      * 
-     * @see com.itmill.toolkit.ui.Component#attach()
+     * @see com.vaadin.ui.Component#attach()
      */
     @Override
     public void attach() {
@@ -135,7 +135,7 @@ public class IntroWelcome extends Feature implements URIHandler,
     /**
      * Remove all handlers from window
      * 
-     * @see com.itmill.toolkit.ui.Component#detach()
+     * @see com.vaadin.ui.Component#detach()
      */
     @Override
     public void detach() {
@@ -147,7 +147,7 @@ public class IntroWelcome extends Feature implements URIHandler,
     /**
      * Update URI
      * 
-     * @see com.itmill.toolkit.terminal.URIHandler#handleURI(URL, String)
+     * @see com.vaadin.terminal.URIHandler#handleURI(URL, String)
      */
     public DownloadStream handleURI(URL context, String relativeUri) {
         return null;
@@ -156,7 +156,7 @@ public class IntroWelcome extends Feature implements URIHandler,
     /**
      * Show system status if systemStatus is given on URL
      * 
-     * @see com.itmill.toolkit.terminal.ParameterHandler#handleParameters(Map)
+     * @see com.vaadin.terminal.ParameterHandler#handleParameters(Map)
      */
     public void handleParameters(Map parameters) {
         for (final Iterator i = parameters.keySet().iterator(); i.hasNext();) {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java b/src/com/vaadin/tests/featurebrowser/PropertyPanel.java
index 3567d2aff8..b62138e46a 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/PropertyPanel.java
+++ b/src/com/vaadin/tests/featurebrowser/PropertyPanel.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.tests.featurebrowser;
+package com.vaadin.tests.featurebrowser;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -13,28 +13,28 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.SystemError;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.AbstractComponentContainer;
-import com.itmill.toolkit.ui.AbstractField;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.SystemError;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.AbstractComponentContainer;
+import com.vaadin.ui.AbstractField;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Window;
 
 public class PropertyPanel extends Panel implements Button.ClickListener,
         Property.ValueChangeListener {
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/components.png b/src/com/vaadin/tests/featurebrowser/components.png
index e5681d4d37..e5681d4d37 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/components.png
+++ b/src/com/vaadin/tests/featurebrowser/components.png
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/icon_demo.png b/src/com/vaadin/tests/featurebrowser/icon_demo.png
index 6a5c295d6a..6a5c295d6a 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/icon_demo.png
+++ b/src/com/vaadin/tests/featurebrowser/icon_demo.png
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/icon_intro.png b/src/com/vaadin/tests/featurebrowser/icon_intro.png
index 032712985c..032712985c 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/icon_intro.png
+++ b/src/com/vaadin/tests/featurebrowser/icon_intro.png
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/itmill.gif b/src/com/vaadin/tests/featurebrowser/itmill.gif
index b1c3e053f0..b1c3e053f0 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/itmill.gif
+++ b/src/com/vaadin/tests/featurebrowser/itmill.gif
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/itmill_spin.swf b/src/com/vaadin/tests/featurebrowser/itmill_spin.swf
index 9e58ce29c6..9e58ce29c6 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/itmill_spin.swf
+++ b/src/com/vaadin/tests/featurebrowser/itmill_spin.swf
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/m-bullet-blue.gif b/src/com/vaadin/tests/featurebrowser/m-bullet-blue.gif
index fa6b38b4c9..fa6b38b4c9 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/m-bullet-blue.gif
+++ b/src/com/vaadin/tests/featurebrowser/m-bullet-blue.gif
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/m.gif b/src/com/vaadin/tests/featurebrowser/m.gif
index 2201bdfc1c..2201bdfc1c 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/m.gif
+++ b/src/com/vaadin/tests/featurebrowser/m.gif
diff --git a/src/com/itmill/toolkit/tests/itmill_spin.swf b/src/com/vaadin/tests/itmill_spin.swf
index 9e58ce29c6..9e58ce29c6 100644
--- a/src/com/itmill/toolkit/tests/itmill_spin.swf
+++ b/src/com/vaadin/tests/itmill_spin.swf
diff --git a/src/com/itmill/toolkit/tests/layouts/AbsoluteLayoutAddRemove.java b/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
index 14702a75ff..7172dd7e0d 100644
--- a/src/com/itmill/toolkit/tests/layouts/AbsoluteLayoutAddRemove.java
+++ b/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.layouts;
-
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.AbsoluteLayout;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.layouts;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.AbsoluteLayout;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class AbsoluteLayoutAddRemove extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/layouts/DeepComponentTrees.java b/src/com/vaadin/tests/layouts/DeepComponentTrees.java
index de836655c2..7ee89b35db 100644
--- a/src/com/itmill/toolkit/tests/layouts/DeepComponentTrees.java
+++ b/src/com/vaadin/tests/layouts/DeepComponentTrees.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.layouts;
-
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.layouts;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class DeepComponentTrees extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/layouts/FormLayoutWithInvisibleComponent.java b/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
index 540fa6d261..8934adae0a 100644
--- a/src/com/itmill/toolkit/tests/layouts/FormLayoutWithInvisibleComponent.java
+++ b/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.layouts;
-
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.FormLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.layouts;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class FormLayoutWithInvisibleComponent extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/layouts/GridLayoutExpandRatioModification.java b/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index 0c0c237265..781e39bb4e 100644
--- a/src/com/itmill/toolkit/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.layouts;
+package com.vaadin.tests.layouts;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class GridLayoutExpandRatioModification extends TestBase implements
         ClickListener {
diff --git a/src/com/itmill/toolkit/tests/layouts/GridLayoutInsidePanel.java b/src/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
index 4dfb151e10..bc2e8c01cb 100644
--- a/src/com/itmill/toolkit/tests/layouts/GridLayoutInsidePanel.java
+++ b/src/com/vaadin/tests/layouts/GridLayoutInsidePanel.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.layouts;
+package com.vaadin.tests.layouts;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
 
 public class GridLayoutInsidePanel extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/layouts/GridLayoutInsidePanel2.java b/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
index a7fa42f1c2..22fabab4d7 100644
--- a/src/com/itmill/toolkit/tests/layouts/GridLayoutInsidePanel2.java
+++ b/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.layouts;
+package com.vaadin.tests.layouts;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Window;
 
 public class GridLayoutInsidePanel2 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/layouts/OrderedLayoutBasics.java b/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index 3f5b468f7d..3167947697 100644
--- a/src/com/itmill/toolkit/tests/layouts/OrderedLayoutBasics.java
+++ b/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java
@@ -1,26 +1,26 @@
-package com.itmill.toolkit.tests.layouts;
+package com.vaadin.tests.layouts;
 
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.AbstractOrderedLayout;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
-import com.itmill.toolkit.ui.Layout.AlignmentHandler;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.terminal.UserError;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.AbstractOrderedLayout;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Layout.AlignmentHandler;
 
 public class OrderedLayoutBasics extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/layouts/OrderedLayoutCSSCompatibility.java b/src/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
index 5c37903910..6073edf249 100644
--- a/src/com/itmill/toolkit/tests/layouts/OrderedLayoutCSSCompatibility.java
+++ b/src/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.layouts;
+package com.vaadin.tests.layouts;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
 
 public class OrderedLayoutCSSCompatibility extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/layouts/TestAbsoluteLayout.java b/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
index f3c02dce3d..efabf0ac9a 100644
--- a/src/com/itmill/toolkit/tests/layouts/TestAbsoluteLayout.java
+++ b/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.tests.layouts;
+package com.vaadin.tests.layouts;
 
 import java.io.File;
 import java.net.URL;
@@ -6,27 +6,27 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.AbsoluteLayout;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.FieldFactory;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.AbsoluteLayout;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.FieldFactory;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TestAbsoluteLayout extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/layouts/VerticalLayoutExpandRatioModification.java b/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
index 3277466adb..9aadbadd78 100644
--- a/src/com/itmill/toolkit/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.layouts;
+package com.vaadin.tests.layouts;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class VerticalLayoutExpandRatioModification extends TestBase implements
         ClickListener {
diff --git a/src/com/itmill/toolkit/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java b/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
index 37e7897097..8ff742c179 100644
--- a/src/com/itmill/toolkit/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
+++ b/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponents.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.layouts;
+package com.vaadin.tests.layouts;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
 
 public class VerticalLayoutWithRelativeSizeComponents extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/m.gif b/src/com/vaadin/tests/m.gif
index 2201bdfc1c..2201bdfc1c 100644
--- a/src/com/itmill/toolkit/tests/m.gif
+++ b/src/com/vaadin/tests/m.gif
diff --git a/src/com/itmill/toolkit/tests/robustness/Robustness.java b/src/com/vaadin/tests/robustness/Robustness.java
index 76a45a3639..6294e09d4e 100644
--- a/src/com/itmill/toolkit/tests/robustness/Robustness.java
+++ b/src/com/vaadin/tests/robustness/Robustness.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.robustness;
+package com.vaadin.tests.robustness;
 
-import com.itmill.toolkit.automatedtests.util.Log;
-import com.itmill.toolkit.tests.util.RandomComponents;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.automatedtests.util.Log;
+import com.vaadin.tests.util.RandomComponents;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public abstract class Robustness extends com.itmill.toolkit.Application
+public abstract class Robustness extends com.vaadin.Application
         implements Button.ClickListener {
 
     static int totalCount = 0;
diff --git a/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java b/src/com/vaadin/tests/robustness/RobustnessSimple.java
index dc4626aad7..63324ad9bc 100644
--- a/src/com/itmill/toolkit/tests/robustness/RobustnessSimple.java
+++ b/src/com/vaadin/tests/robustness/RobustnessSimple.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.robustness;
+package com.vaadin.tests.robustness;
 
-import com.itmill.toolkit.automatedtests.util.Log;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
+import com.vaadin.automatedtests.util.Log;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
 
 public class RobustnessSimple extends Robustness implements
         Button.ClickListener {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1225.java b/src/com/vaadin/tests/tickets/Ticket1225.java
index c119478c43..5244308f45 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1225.java
+++ b/src/com/vaadin/tests/tickets/Ticket1225.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.tests.TestForTablesInitialColumnWidthLogicRendering;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 /**
  * With IE7 extra scrollbars appear in content area all though content fits
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1230.java b/src/com/vaadin/tests/tickets/Ticket1230.java
index 76102bb2ba..233dd3aae8 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1230.java
+++ b/src/com/vaadin/tests/tickets/Ticket1230.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Item;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket1230 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket124.java b/src/com/vaadin/tests/tickets/Ticket124.java
index 4d3293769b..1c2ca1a2e1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket124.java
+++ b/src/com/vaadin/tests/tickets/Ticket124.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket124 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1245.java b/src/com/vaadin/tests/tickets/Ticket1245.java
index 61800af0a1..c2a150b8ba 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1245.java
+++ b/src/com/vaadin/tests/tickets/Ticket1245.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.ui.AbstractSelect;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.ui.AbstractSelect;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Window;
 
-public class Ticket1245 extends com.itmill.toolkit.Application {
+public class Ticket1245 extends com.vaadin.Application {
 
     TextField f = new TextField();
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1362Login.java b/src/com/vaadin/tests/tickets/Ticket1362Login.java
index 3ced64947b..1ac4a1d048 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1362Login.java
+++ b/src/com/vaadin/tests/tickets/Ticket1362Login.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.io.ByteArrayInputStream;
 import java.net.URL;
@@ -7,20 +7,20 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ApplicationResource;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.Application;
+import com.vaadin.terminal.ApplicationResource;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.Notification;
 
 /**
  * Proof of concept how to create a decent login screen that works with browsers
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1365.java b/src/com/vaadin/tests/tickets/Ticket1365.java
index becd0781b0..1a890e313e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1365.java
+++ b/src/com/vaadin/tests/tickets/Ticket1365.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.event.ShortcutAction;
-import com.itmill.toolkit.event.Action.Handler;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.event.Action;
+import com.vaadin.event.ShortcutAction;
+import com.vaadin.event.Action.Handler;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
-public class Ticket1365 extends com.itmill.toolkit.Application implements
+public class Ticket1365 extends com.vaadin.Application implements
         Handler {
 
     TextField f = new TextField();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1368.java b/src/com/vaadin/tests/tickets/Ticket1368.java
index b2f137ec8c..9df316fdcb 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1368.java
+++ b/src/com/vaadin/tests/tickets/Ticket1368.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.tests.TestForTablesInitialColumnWidthLogicRendering;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 /**
  */
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1397.java b/src/com/vaadin/tests/tickets/Ticket1397.java
index 08305830eb..84e0c6ef0a 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1397.java
+++ b/src/com/vaadin/tests/tickets/Ticket1397.java
@@ -1,18 +1,18 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Date;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.InlineDateField;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.PopupView;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.InlineDateField;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.PopupView;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket1397 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1435.java b/src/com/vaadin/tests/tickets/Ticket1435.java
index d235ac9cef..9058184d8f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1435.java
+++ b/src/com/vaadin/tests/tickets/Ticket1435.java
@@ -1,18 +1,18 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket1435 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1444.java b/src/com/vaadin/tests/tickets/Ticket1444.java
index 9ee7d4772e..2944f460f6 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1444.java
+++ b/src/com/vaadin/tests/tickets/Ticket1444.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket1444 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1465ModalNotification.java b/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
index 62bebb7319..3437ca5d2a 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1465ModalNotification.java
+++ b/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket1465ModalNotification extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1506.java b/src/com/vaadin/tests/tickets/Ticket1506.java
index 450a495f94..4788d27aad 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1506.java
+++ b/src/com/vaadin/tests/tickets/Ticket1506.java
@@ -1,7 +1,7 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Panel;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Panel;
 
 public class Ticket1506 extends CustomComponent {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1506_Panel.java b/src/com/vaadin/tests/tickets/Ticket1506_Panel.java
index 348db4a3ac..edbfd8928d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1506_Panel.java
+++ b/src/com/vaadin/tests/tickets/Ticket1506_Panel.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
+import com.vaadin.data.Container;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
 
 /**
  * @author Efecte R&D
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer.java b/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
index 648aecf2fc..7002602ca2 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer.java
+++ b/src/com/vaadin/tests/tickets/Ticket1506_TestContainer.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.data.util.PropertysetItem;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.data.util.PropertysetItem;
 
 /**
  * @author Efecte R&D
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer2.java b/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
index 7654eef668..4345b3e581 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1506_TestContainer2.java
+++ b/src/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.data.util.PropertysetItem;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.data.util.PropertysetItem;
 
 /**
  * @author Efecte R&D
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1519.java b/src/com/vaadin/tests/tickets/Ticket1519.java
index 72ebc5e0bb..d088b2be23 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1519.java
+++ b/src/com/vaadin/tests/tickets/Ticket1519.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Window;
 
 public class Ticket1519 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1572.java b/src/com/vaadin/tests/tickets/Ticket1572.java
index 11457b02f6..b2bc0397fd 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1572.java
+++ b/src/com/vaadin/tests/tickets/Ticket1572.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public class Ticket1572 extends com.itmill.toolkit.Application {
+public class Ticket1572 extends com.vaadin.Application {
 
     private Label state;
     private GridLayout gl;
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1581.java b/src/com/vaadin/tests/tickets/Ticket1581.java
index a8f65314e5..0b170260d9 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1581.java
+++ b/src/com/vaadin/tests/tickets/Ticket1581.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Date;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.ProgressIndicator;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
-public class Ticket1581 extends com.itmill.toolkit.Application {
+public class Ticket1581 extends com.vaadin.Application {
 
     private Label time;
     private ProgressIndicator poller;
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1589.java b/src/com/vaadin/tests/tickets/Ticket1589.java
index 9a4767dc2b..3debf78f25 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1589.java
+++ b/src/com/vaadin/tests/tickets/Ticket1589.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.awt.Color;
 import java.awt.Graphics;
@@ -11,12 +11,12 @@ import java.util.Date;
 
 import javax.imageio.ImageIO;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Window;
 
 public class Ticket1589 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1598.java b/src/com/vaadin/tests/tickets/Ticket1598.java
index b889e5a565..ca2da6d010 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1598.java
+++ b/src/com/vaadin/tests/tickets/Ticket1598.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.MenuBar;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.MenuBar.Command;
-import com.itmill.toolkit.ui.MenuBar.MenuItem;
+import com.vaadin.Application;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.MenuBar;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.MenuBar.Command;
+import com.vaadin.ui.MenuBar.MenuItem;
 
 public class Ticket1598 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket161.java b/src/com/vaadin/tests/tickets/Ticket161.java
index 5369c2397c..a09b0d01cb 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket161.java
+++ b/src/com/vaadin/tests/tickets/Ticket161.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.tests.TestForTablesInitialColumnWidthLogicRendering;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Container;
+import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  */
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1632.java b/src/com/vaadin/tests/tickets/Ticket1632.java
index e126c1193e..1c521f8afb 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1632.java
+++ b/src/com/vaadin/tests/tickets/Ticket1632.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Item;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  */
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1659.java b/src/com/vaadin/tests/tickets/Ticket1659.java
index 94b222a2bf..78715c89d1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1659.java
+++ b/src/com/vaadin/tests/tickets/Ticket1659.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket1659 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1663.java b/src/com/vaadin/tests/tickets/Ticket1663.java
index a25741ee5f..04adfa3c79 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1663.java
+++ b/src/com/vaadin/tests/tickets/Ticket1663.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.terminal.SystemError;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.terminal.SystemError;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
-public class Ticket1663 extends com.itmill.toolkit.Application {
+public class Ticket1663 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1673.java b/src/com/vaadin/tests/tickets/Ticket1673.java
index 2bfd551799..f4461803de 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1673.java
+++ b/src/com/vaadin/tests/tickets/Ticket1673.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Window;
 
-public class Ticket1673 extends com.itmill.toolkit.Application {
+public class Ticket1673 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1710.java b/src/com/vaadin/tests/tickets/Ticket1710.java
index 0c043b3cdd..359af103d3 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
+++ b/src/com/vaadin/tests/tickets/Ticket1710.java
@@ -1,32 +1,32 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.util.MethodProperty;
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.terminal.SystemError;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Layout.AlignmentHandler;
-
-public class Ticket1710 extends com.itmill.toolkit.Application {
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.util.MethodProperty;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.terminal.SystemError;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Layout.AlignmentHandler;
+
+public class Ticket1710 extends com.vaadin.Application {
 
     LinkedList listOfAllFields = new LinkedList();
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1737.java b/src/com/vaadin/tests/tickets/Ticket1737.java
index ac1ab350f1..cc44e43c46 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1737.java
+++ b/src/com/vaadin/tests/tickets/Ticket1737.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.demo.Calc;
-import com.itmill.toolkit.terminal.ClassResource;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.demo.Calc;
+import com.vaadin.terminal.ClassResource;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.Resource;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
 
 public class Ticket1737 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1767.java b/src/com/vaadin/tests/tickets/Ticket1767.java
index 550d3a6d0f..a65a601175 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1767.java
+++ b/src/com/vaadin/tests/tickets/Ticket1767.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Window;
 
-public class Ticket1767 extends com.itmill.toolkit.Application {
+public class Ticket1767 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1772.java b/src/com/vaadin/tests/tickets/Ticket1772.java
index 4e9221d0c1..977d8563f0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1772.java
+++ b/src/com/vaadin/tests/tickets/Ticket1772.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public class Ticket1772 extends com.itmill.toolkit.Application {
+public class Ticket1772 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1775.java b/src/com/vaadin/tests/tickets/Ticket1775.java
index 403efac2e4..cd66ecf0e5 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1775.java
+++ b/src/com/vaadin/tests/tickets/Ticket1775.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public class Ticket1775 extends com.itmill.toolkit.Application {
+public class Ticket1775 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1804.java b/src/com/vaadin/tests/tickets/Ticket1804.java
index 102f9c25fa..5a0cc7e30b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1804.java
+++ b/src/com/vaadin/tests/tickets/Ticket1804.java
@@ -1,20 +1,20 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.util.MethodProperty;
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.terminal.SystemError;
-import com.itmill.toolkit.ui.AbstractField;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Validator;
+import com.vaadin.data.util.MethodProperty;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.terminal.SystemError;
+import com.vaadin.ui.AbstractField;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public class Ticket1804 extends com.itmill.toolkit.Application {
+public class Ticket1804 extends com.vaadin.Application {
 
     LinkedList listOfAllFields = new LinkedList();
 
@@ -24,7 +24,7 @@ public class Ticket1804 extends com.itmill.toolkit.Application {
         final Window main = new Window("#1804");
         setMainWindow(main);
 
-        com.itmill.toolkit.ui.Select s;
+        com.vaadin.ui.Select s;
 
         s = new Select("Select with null selection allowed; required=true");
         s.setNullSelectionAllowed(true);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1805.java b/src/com/vaadin/tests/tickets/Ticket1805.java
index b72d3e7e6d..ef80904854 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1805.java
+++ b/src/com/vaadin/tests/tickets/Ticket1805.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
-public class Ticket1805 extends com.itmill.toolkit.Application {
+public class Ticket1805 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1806.java b/src/com/vaadin/tests/tickets/Ticket1806.java
index 61ef29f396..1949fddfa1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1806.java
+++ b/src/com/vaadin/tests/tickets/Ticket1806.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public class Ticket1806 extends com.itmill.toolkit.Application {
+public class Ticket1806 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1811.java b/src/com/vaadin/tests/tickets/Ticket1811.java
index 0075cac4ce..29571220a2 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1811.java
+++ b/src/com/vaadin/tests/tickets/Ticket1811.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.validator.StringLengthValidator;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.data.Validator;
+import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public class Ticket1811 extends com.itmill.toolkit.Application {
+public class Ticket1811 extends com.vaadin.Application {
 
     LinkedList listOfAllFields = new LinkedList();
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1819.java b/src/com/vaadin/tests/tickets/Ticket1819.java
index 1f03390976..e014dfee29 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1819.java
+++ b/src/com/vaadin/tests/tickets/Ticket1819.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.ui.AbstractField;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.AbstractField;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public class Ticket1819 extends com.itmill.toolkit.Application {
+public class Ticket1819 extends com.vaadin.Application {
 
     LinkedList listOfAllFields = new LinkedList();
 
@@ -20,7 +20,7 @@ public class Ticket1819 extends com.itmill.toolkit.Application {
         final Window main = new Window("#1819");
         setMainWindow(main);
 
-        com.itmill.toolkit.ui.Select s;
+        com.vaadin.ui.Select s;
 
         s = new Select("Select with null selection allowed");
         s.setNullSelectionAllowed(true);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java b/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
index 050f520aa5..13e9591303 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java
+++ b/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
-public class Ticket1834PanelScrolling extends com.itmill.toolkit.Application {
+public class Ticket1834PanelScrolling extends com.vaadin.Application {
 
     private static final int ROWS = 50;
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1857.java b/src/com/vaadin/tests/tickets/Ticket1857.java
index 5a014de09b..74278af70b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1857.java
+++ b/src/com/vaadin/tests/tickets/Ticket1857.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.event.Action.Handler;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.event.Action;
+import com.vaadin.event.Action.Handler;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 public class Ticket1857 extends Application implements Handler {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1868.java b/src/com/vaadin/tests/tickets/Ticket1868.java
index 897ac4aac3..3b68146df3 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1868.java
+++ b/src/com/vaadin/tests/tickets/Ticket1868.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
 
-public class Ticket1868 extends com.itmill.toolkit.Application {
+public class Ticket1868 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1869.java b/src/com/vaadin/tests/tickets/Ticket1869.java
index 25f97201e6..6c101441a6 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1869.java
+++ b/src/com/vaadin/tests/tickets/Ticket1869.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.LinkedList;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
 
-public class Ticket1869 extends com.itmill.toolkit.Application {
+public class Ticket1869 extends com.vaadin.Application {
 
     LinkedList listOfAllFields = new LinkedList();
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1878.java b/src/com/vaadin/tests/tickets/Ticket1878.java
index e5b4578693..04f6efb78c 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1878.java
+++ b/src/com/vaadin/tests/tickets/Ticket1878.java
@@ -1,29 +1,29 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Date;
 import java.util.Iterator;
 import java.util.Random;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.data.validator.StringLengthValidator;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.FormLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
-import com.itmill.toolkit.ui.Layout.AlignmentHandler;
+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.ui.Button;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Layout.AlignmentHandler;
 
 public class Ticket1878 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1900.java b/src/com/vaadin/tests/tickets/Ticket1900.java
index 7365401a65..a6f3c5c224 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1900.java
+++ b/src/com/vaadin/tests/tickets/Ticket1900.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Validator;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket1900 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1902.java b/src/com/vaadin/tests/tickets/Ticket1902.java
index 89f3148817..716b6b94f0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1902.java
+++ b/src/com/vaadin/tests/tickets/Ticket1902.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket1902 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1904.java b/src/com/vaadin/tests/tickets/Ticket1904.java
index 41d10630ab..87ea8eeb1f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1904.java
+++ b/src/com/vaadin/tests/tickets/Ticket1904.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket1904 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1916.java b/src/com/vaadin/tests/tickets/Ticket1916.java
index 1548949ff9..9976393664 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1916.java
+++ b/src/com/vaadin/tests/tickets/Ticket1916.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket1916 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1919.java b/src/com/vaadin/tests/tickets/Ticket1919.java
index 83581bee5e..bf9b826b38 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1919.java
+++ b/src/com/vaadin/tests/tickets/Ticket1919.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
 
-public class Ticket1919 extends com.itmill.toolkit.Application {
+public class Ticket1919 extends com.vaadin.Application {
 
     private GridLayout lo;
     private boolean on = true;
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1921.java b/src/com/vaadin/tests/tickets/Ticket1921.java
index 2e78422277..8dae844b75 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1921.java
+++ b/src/com/vaadin/tests/tickets/Ticket1921.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Map;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket1921 extends Application implements ParameterHandler {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1923.java b/src/com/vaadin/tests/tickets/Ticket1923.java
index b75b08dbac..8ed9273a06 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1923.java
+++ b/src/com/vaadin/tests/tickets/Ticket1923.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
 
-public class Ticket1923 extends com.itmill.toolkit.Application {
+public class Ticket1923 extends com.vaadin.Application {
 
     private static final int ROWS = 50;
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1924ThemeChanging.java b/src/com/vaadin/tests/tickets/Ticket1924ThemeChanging.java
index ac4d9562d3..3e6b47cbc7 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1924ThemeChanging.java
+++ b/src/com/vaadin/tests/tickets/Ticket1924ThemeChanging.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
-public class Ticket1924ThemeChanging extends com.itmill.toolkit.Application {
+public class Ticket1924ThemeChanging extends com.vaadin.Application {
 
     private Label l = new Label("Background should be red with test theme");
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1925.java b/src/com/vaadin/tests/tickets/Ticket1925.java
index 92c92eeba1..83e5e1cfd4 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1925.java
+++ b/src/com/vaadin/tests/tickets/Ticket1925.java
@@ -1,7 +1,7 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Window;
 
 public class Ticket1925 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1934.java b/src/com/vaadin/tests/tickets/Ticket1934.java
index c086f51867..b80dfc07e0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1934.java
+++ b/src/com/vaadin/tests/tickets/Ticket1934.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 public class Ticket1934 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1939.java b/src/com/vaadin/tests/tickets/Ticket1939.java
index 97f6437d9f..429834c382 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1939.java
+++ b/src/com/vaadin/tests/tickets/Ticket1939.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket1939 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1940.java b/src/com/vaadin/tests/tickets/Ticket1940.java
index 347b17878b..129a761e1c 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1940.java
+++ b/src/com/vaadin/tests/tickets/Ticket1940.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket1940 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1953.java b/src/com/vaadin/tests/tickets/Ticket1953.java
index e37a393a15..43e7f10220 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1953.java
+++ b/src/com/vaadin/tests/tickets/Ticket1953.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 public class Ticket1953 extends Application {
     public static final String cellStyle = "test-cell";
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java b/src/com/vaadin/tests/tickets/Ticket1966.java
index de95399bf8..d6c5accd4c 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1966.java
+++ b/src/com/vaadin/tests/tickets/Ticket1966.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Layout.AlignmentHandler;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Layout.AlignmentHandler;
 
 public class Ticket1966 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java b/src/com/vaadin/tests/tickets/Ticket1966_2.java
index a4e7e24dd1..862cb8ecd3 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1966_2.java
+++ b/src/com/vaadin/tests/tickets/Ticket1966_2.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Layout.AlignmentHandler;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Layout.AlignmentHandler;
 
 public class Ticket1966_2 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java b/src/com/vaadin/tests/tickets/Ticket1966_3.java
index 59fc33d3ad..6cd552b6b2 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1966_3.java
+++ b/src/com/vaadin/tests/tickets/Ticket1966_3.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket1966_3 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1969.java b/src/com/vaadin/tests/tickets/Ticket1969.java
index 606d571d37..5e183beb78 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1969.java
+++ b/src/com/vaadin/tests/tickets/Ticket1969.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.tests.TestForTablesInitialColumnWidthLogicRendering;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-
-public class Ticket1969 extends com.itmill.toolkit.Application {
+package com.vaadin.tests.tickets;
+
+import com.vaadin.terminal.UserError;
+import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+
+public class Ticket1969 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1970.java b/src/com/vaadin/tests/tickets/Ticket1970.java
index 6550f0aa76..b23a3f58d6 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1970.java
+++ b/src/com/vaadin/tests/tickets/Ticket1970.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Iterator;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.CloseEvent;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.CloseEvent;
 
 public class Ticket1970 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1972.java b/src/com/vaadin/tests/tickets/Ticket1972.java
index 5b885f18cd..6cbbbb9f92 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1972.java
+++ b/src/com/vaadin/tests/tickets/Ticket1972.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 public class Ticket1972 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1973.java b/src/com/vaadin/tests/tickets/Ticket1973.java
index 27a42ffbf8..4e93ef57b4 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1973.java
+++ b/src/com/vaadin/tests/tickets/Ticket1973.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
-public class Ticket1973 extends com.itmill.toolkit.Application {
+public class Ticket1973 extends com.vaadin.Application {
 
     Window main = new Window();
     Table table = new Table();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1973_2.java b/src/com/vaadin/tests/tickets/Ticket1973_2.java
index 2879213a8e..875cc70bc6 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1973_2.java
+++ b/src/com/vaadin/tests/tickets/Ticket1973_2.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 public class Ticket1973_2 extends Application {
     Window main = new Window();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1975.java b/src/com/vaadin/tests/tickets/Ticket1975.java
index faaf11d9e8..1d35046475 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1975.java
+++ b/src/com/vaadin/tests/tickets/Ticket1975.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.gwt.server.WebApplicationContext;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.Application;
+import com.vaadin.terminal.gwt.server.WebApplicationContext;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket1975 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1982.java b/src/com/vaadin/tests/tickets/Ticket1982.java
index 8f1ef81885..a81478ff67 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1982.java
+++ b/src/com/vaadin/tests/tickets/Ticket1982.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket1982 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1983.java b/src/com/vaadin/tests/tickets/Ticket1983.java
index 977361b6e0..b02047aca2 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1983.java
+++ b/src/com/vaadin/tests/tickets/Ticket1983.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 /**
  * Test class for ticket 1983
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1986.java b/src/com/vaadin/tests/tickets/Ticket1986.java
index 1a920da655..1b96f7bd39 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1986.java
+++ b/src/com/vaadin/tests/tickets/Ticket1986.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.ListSelect;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.TwinColSelect;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.TwinColSelect;
+import com.vaadin.ui.Window;
 
 public class Ticket1986 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1991.java b/src/com/vaadin/tests/tickets/Ticket1991.java
index a2f10a753a..430c54ec92 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1991.java
+++ b/src/com/vaadin/tests/tickets/Ticket1991.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
-public class Ticket1991 extends com.itmill.toolkit.Application {
+public class Ticket1991 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1995.java b/src/com/vaadin/tests/tickets/Ticket1995.java
index 38f041f8fd..1745ace18c 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1995.java
+++ b/src/com/vaadin/tests/tickets/Ticket1995.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Container.Filterable;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Container.Filterable;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket1995 extends Application {
 
@@ -36,7 +36,7 @@ public class Ticket1995 extends Application {
 
         mainWin.addComponent(table);
         mainWin.addComponent(new Button("Add item",
-                new com.itmill.toolkit.ui.Button.ClickListener() {
+                new com.vaadin.ui.Button.ClickListener() {
 
                     public void buttonClick(ClickEvent event) {
                         addItem();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket20.java b/src/com/vaadin/tests/tickets/Ticket20.java
index 193bb0961f..7adb2e932e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket20.java
+++ b/src/com/vaadin/tests/tickets/Ticket20.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.util.MethodProperty;
-import com.itmill.toolkit.data.validator.CompositeValidator;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.Validator;
+import com.vaadin.data.util.MethodProperty;
+import com.vaadin.data.validator.CompositeValidator;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket20 extends Application {
 
@@ -88,7 +88,7 @@ public class Ticket20 extends Application {
         mainWin.addComponent(new Button("Validate integer",
                 new Button.ClickListener() {
                     public void buttonClick(
-                            com.itmill.toolkit.ui.Button.ClickEvent event) {
+                            com.vaadin.ui.Button.ClickEvent event) {
                         mainWin.showNotification("The field is "
                                 + (tx.isValid() ? "" : "not ") + "valid");
                     };
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2001.java b/src/com/vaadin/tests/tickets/Ticket2001.java
index 3ce16c2030..f3fbb4c508 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2001.java
+++ b/src/com/vaadin/tests/tickets/Ticket2001.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2001 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2002.java b/src/com/vaadin/tests/tickets/Ticket2002.java
index 596f931570..35f2c84872 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2002.java
+++ b/src/com/vaadin/tests/tickets/Ticket2002.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.util.MethodProperty;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.util.MethodProperty;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2002 extends Application {
     private Long long1 = new Long(1L);
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2007.java b/src/com/vaadin/tests/tickets/Ticket2007.java
index 8168032b34..e925519ee2 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2007.java
+++ b/src/com/vaadin/tests/tickets/Ticket2007.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket2007 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2009.java b/src/com/vaadin/tests/tickets/Ticket2009.java
index a5f7782d30..4118794aa7 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2009.java
+++ b/src/com/vaadin/tests/tickets/Ticket2009.java
@@ -1,19 +1,19 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.event.ItemClickEvent;
-import com.itmill.toolkit.tests.TestForTablesInitialColumnWidthLogicRendering;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-
-public class Ticket2009 extends com.itmill.toolkit.Application {
+package com.vaadin.tests.tickets;
+
+import com.vaadin.data.Container;
+import com.vaadin.event.ItemClickEvent;
+import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+
+public class Ticket2009 extends com.vaadin.Application {
 
     TextField f = new TextField();
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2011.java b/src/com/vaadin/tests/tickets/Ticket2011.java
index 4fc75fc1e6..d4e5890635 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2011.java
+++ b/src/com/vaadin/tests/tickets/Ticket2011.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Window;
 
 public class Ticket2011 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2014.java b/src/com/vaadin/tests/tickets/Ticket2014.java
index f6c66421d4..1cf0e4c58e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2014.java
+++ b/src/com/vaadin/tests/tickets/Ticket2014.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.UUID;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2014 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java b/src/com/vaadin/tests/tickets/Ticket2021.java
index e8a2bb3f04..5ea423ea99 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2021.java
+++ b/src/com/vaadin/tests/tickets/Ticket2021.java
@@ -1,18 +1,18 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2021 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2022.java b/src/com/vaadin/tests/tickets/Ticket2022.java
index 3bffd0a281..f88896a5f8 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2022.java
+++ b/src/com/vaadin/tests/tickets/Ticket2022.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2022 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2023.java b/src/com/vaadin/tests/tickets/Ticket2023.java
index ebcfd50448..fac09e07ea 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2023.java
+++ b/src/com/vaadin/tests/tickets/Ticket2023.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public class Ticket2023 extends com.itmill.toolkit.Application implements
+public class Ticket2023 extends com.vaadin.Application implements
         Button.ClickListener {
 
     AbstractComponent c = new Button();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2024.java b/src/com/vaadin/tests/tickets/Ticket2024.java
index cbc19fdbc9..1c2c7b4a33 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2024.java
+++ b/src/com/vaadin/tests/tickets/Ticket2024.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2024 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2026.java b/src/com/vaadin/tests/tickets/Ticket2026.java
index bc79cddce4..4bbb9057ff 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2026.java
+++ b/src/com/vaadin/tests/tickets/Ticket2026.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2026 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2029.java b/src/com/vaadin/tests/tickets/Ticket2029.java
index 98c80cdd53..4c53e2cd9e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2029.java
+++ b/src/com/vaadin/tests/tickets/Ticket2029.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Random;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2029 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2032.java b/src/com/vaadin/tests/tickets/Ticket2032.java
index e0bb9e9407..f51984f336 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2032.java
+++ b/src/com/vaadin/tests/tickets/Ticket2032.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2032 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2033.java b/src/com/vaadin/tests/tickets/Ticket2033.java
index 25dc8a6a33..744195619e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2033.java
+++ b/src/com/vaadin/tests/tickets/Ticket2033.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2033 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2037.java b/src/com/vaadin/tests/tickets/Ticket2037.java
index fa8c440a1d..084ca14c0f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2037.java
+++ b/src/com/vaadin/tests/tickets/Ticket2037.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
-public class Ticket2037 extends com.itmill.toolkit.Application {
+public class Ticket2037 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2038.java b/src/com/vaadin/tests/tickets/Ticket2038.java
index 34ad22f272..e566d50520 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2038.java
+++ b/src/com/vaadin/tests/tickets/Ticket2038.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Window.Notification;
 
 public class Ticket2038 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2040.java b/src/com/vaadin/tests/tickets/Ticket2040.java
index 1a5e96da2b..e5300d5eed 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2040.java
+++ b/src/com/vaadin/tests/tickets/Ticket2040.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
-public class Ticket2040 extends com.itmill.toolkit.Application {
+public class Ticket2040 extends com.vaadin.Application {
 
     TextField f = new TextField();
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2042.java b/src/com/vaadin/tests/tickets/Ticket2042.java
index dc81de7614..6339222a0b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2042.java
+++ b/src/com/vaadin/tests/tickets/Ticket2042.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
-import com.itmill.toolkit.ui.Window.Notification;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Window.Notification;
 
 public class Ticket2042 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2043.java b/src/com/vaadin/tests/tickets/Ticket2043.java
index e81fd9aea3..c003439c99 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2043.java
+++ b/src/com/vaadin/tests/tickets/Ticket2043.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Window;
 
 public class Ticket2043 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2048.java b/src/com/vaadin/tests/tickets/Ticket2048.java
index 4ca741edd2..f1bfecdcc0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2048.java
+++ b/src/com/vaadin/tests/tickets/Ticket2048.java
@@ -1,18 +1,18 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2048 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2051.java b/src/com/vaadin/tests/tickets/Ticket2051.java
index 804b666b70..b31acbde11 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2051.java
+++ b/src/com/vaadin/tests/tickets/Ticket2051.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.Item;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2051 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2053.java b/src/com/vaadin/tests/tickets/Ticket2053.java
index a465d1a472..167a1440c0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2053.java
+++ b/src/com/vaadin/tests/tickets/Ticket2053.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Window.CloseEvent;
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Window.CloseEvent;
 
 public class Ticket2053 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2060.java b/src/com/vaadin/tests/tickets/Ticket2060.java
index 4fc1089225..09a391e80d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2060.java
+++ b/src/com/vaadin/tests/tickets/Ticket2060.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2060 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2061.java b/src/com/vaadin/tests/tickets/Ticket2061.java
index 4f364e875f..b6c8f1fb38 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2061.java
+++ b/src/com/vaadin/tests/tickets/Ticket2061.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+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.ui.Accordion;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 public class Ticket2061 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2061b.java b/src/com/vaadin/tests/tickets/Ticket2061b.java
index 4e5240f773..8d87a70788 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2061b.java
+++ b/src/com/vaadin/tests/tickets/Ticket2061b.java
@@ -1,24 +1,24 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+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.ui.Accordion;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
+import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
 
 public class Ticket2061b extends Application implements
         SelectedTabChangeListener {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2061c.java b/src/com/vaadin/tests/tickets/Ticket2061c.java
index 421d434c54..abb79621f4 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2061c.java
+++ b/src/com/vaadin/tests/tickets/Ticket2061c.java
@@ -1,22 +1,22 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeEvent;
-import com.itmill.toolkit.ui.TabSheet.SelectedTabChangeListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+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.ui.Accordion;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
+import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
 
 public class Ticket2061c extends Application implements
         SelectedTabChangeListener {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2062.java b/src/com/vaadin/tests/tickets/Ticket2062.java
index 1bb2b285b5..e5650ae18c 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2062.java
+++ b/src/com/vaadin/tests/tickets/Ticket2062.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2062 extends Application {
     private static final Object P1 = new Object();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2083.java b/src/com/vaadin/tests/tickets/Ticket2083.java
index 735fe41677..e074210fec 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2083.java
+++ b/src/com/vaadin/tests/tickets/Ticket2083.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
 
 public class Ticket2083 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2090.java b/src/com/vaadin/tests/tickets/Ticket2090.java
index da85e4adfb..5bc69e0a64 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2090.java
+++ b/src/com/vaadin/tests/tickets/Ticket2090.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2090 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2095.java b/src/com/vaadin/tests/tickets/Ticket2095.java
index 02cb34b0c2..49353db114 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2095.java
+++ b/src/com/vaadin/tests/tickets/Ticket2095.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.Window;
 
 public class Ticket2095 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2098.java b/src/com/vaadin/tests/tickets/Ticket2098.java
index 1b3b8c82b7..829fb30070 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2098.java
+++ b/src/com/vaadin/tests/tickets/Ticket2098.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Window;
 
 public class Ticket2098 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2099.java b/src/com/vaadin/tests/tickets/Ticket2099.java
index bf1f654eca..44c264e07e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2099.java
+++ b/src/com/vaadin/tests/tickets/Ticket2099.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2099 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2101.java b/src/com/vaadin/tests/tickets/Ticket2101.java
index c6046b5ca0..9a260635cf 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2101.java
+++ b/src/com/vaadin/tests/tickets/Ticket2101.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Window;
 
 public class Ticket2101 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2103.java b/src/com/vaadin/tests/tickets/Ticket2103.java
index 13d45c7aa2..3e655b6753 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2103.java
+++ b/src/com/vaadin/tests/tickets/Ticket2103.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.HierarchicalContainer;
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.HierarchicalContainer;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 public class Ticket2103 extends Application {
     private Window mainWindow;
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2104.java b/src/com/vaadin/tests/tickets/Ticket2104.java
index b4fe9ce7e9..974e97871f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2104.java
+++ b/src/com/vaadin/tests/tickets/Ticket2104.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.util.MethodProperty;
-import com.itmill.toolkit.event.ItemClickEvent;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickListener;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Tree;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+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.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket2104 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2106.java b/src/com/vaadin/tests/tickets/Ticket2106.java
index 667454c4c2..953ac84afb 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2106.java
+++ b/src/com/vaadin/tests/tickets/Ticket2106.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Date;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket2106 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2107.java b/src/com/vaadin/tests/tickets/Ticket2107.java
index 765c3c274e..adb6784275 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2107.java
+++ b/src/com/vaadin/tests/tickets/Ticket2107.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Window.Notification;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Validator;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Window.Notification;
 
 public class Ticket2107 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2117.java b/src/com/vaadin/tests/tickets/Ticket2117.java
index f32a77f089..6a22915f03 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2117.java
+++ b/src/com/vaadin/tests/tickets/Ticket2117.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2117 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2119.java b/src/com/vaadin/tests/tickets/Ticket2119.java
index 6e24541b77..7e782dc2a0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2119.java
+++ b/src/com/vaadin/tests/tickets/Ticket2119.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Window;
 
 /**
  * Test case for Ticket 2119.
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2125.java b/src/com/vaadin/tests/tickets/Ticket2125.java
index e98b34de32..49610597db 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2125.java
+++ b/src/com/vaadin/tests/tickets/Ticket2125.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.util.MethodProperty;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Table.CellStyleGenerator;
-import com.itmill.toolkit.ui.Table.ColumnGenerator;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.util.MethodProperty;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Table.CellStyleGenerator;
+import com.vaadin.ui.Table.ColumnGenerator;
 
 public class Ticket2125 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2126.java b/src/com/vaadin/tests/tickets/Ticket2126.java
index 47988502f0..01ef18f2ef 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2126.java
+++ b/src/com/vaadin/tests/tickets/Ticket2126.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 /**
  * 
@@ -14,7 +14,7 @@ import com.itmill.toolkit.ui.Window;
  * client.
  * 
  */
-public class Ticket2126 extends com.itmill.toolkit.Application {
+public class Ticket2126 extends com.vaadin.Application {
 
     Window main = new Window();
     Table table = new Table();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2151.java b/src/com/vaadin/tests/tickets/Ticket2151.java
index 908ef2a35a..06d1f15336 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2151.java
+++ b/src/com/vaadin/tests/tickets/Ticket2151.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2151 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2157.java b/src/com/vaadin/tests/tickets/Ticket2157.java
index 313a38532c..c4f6ff30d3 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2157.java
+++ b/src/com/vaadin/tests/tickets/Ticket2157.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
 
 public class Ticket2157 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2178.java b/src/com/vaadin/tests/tickets/Ticket2178.java
index d64bbea790..c663b29778 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2178.java
+++ b/src/com/vaadin/tests/tickets/Ticket2178.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
 
 public class Ticket2178 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2179.java b/src/com/vaadin/tests/tickets/Ticket2179.java
index d484741e61..4612f7464f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2179.java
+++ b/src/com/vaadin/tests/tickets/Ticket2179.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Validator;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2179 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2180.java b/src/com/vaadin/tests/tickets/Ticket2180.java
index 6a966d3947..9f5e2a2de1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2180.java
+++ b/src/com/vaadin/tests/tickets/Ticket2180.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Window;
 
 public class Ticket2180 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2181.java b/src/com/vaadin/tests/tickets/Ticket2181.java
index ec58671105..d5afb01e0d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2181.java
+++ b/src/com/vaadin/tests/tickets/Ticket2181.java
@@ -1,20 +1,20 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Random;
 import java.util.Set;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.terminal.UserError;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.OptionGroup;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.terminal.UserError;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket2181 extends Application implements Button.ClickListener {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2186.java b/src/com/vaadin/tests/tickets/Ticket2186.java
index 82d0574533..55eff60fef 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2186.java
+++ b/src/com/vaadin/tests/tickets/Ticket2186.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 public class Ticket2186 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2204.java b/src/com/vaadin/tests/tickets/Ticket2204.java
index 02d53c4704..d4bcd55c55 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2204.java
+++ b/src/com/vaadin/tests/tickets/Ticket2204.java
@@ -1,33 +1,33 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.FieldFactory;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+import com.vaadin.Application;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.FieldFactory;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2204 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2208.java b/src/com/vaadin/tests/tickets/Ticket2208.java
index ed851162dc..0c8639603e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2208.java
+++ b/src/com/vaadin/tests/tickets/Ticket2208.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Table.CellStyleGenerator;
-import com.itmill.toolkit.ui.Table.ColumnGenerator;
+import com.vaadin.Application;
+import com.vaadin.data.Item;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Table.CellStyleGenerator;
+import com.vaadin.ui.Table.ColumnGenerator;
 
 public class Ticket2208 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2209.java b/src/com/vaadin/tests/tickets/Ticket2209.java
index 85928f5cc2..02450e23c1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2209.java
+++ b/src/com/vaadin/tests/tickets/Ticket2209.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2209 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2209OL.java b/src/com/vaadin/tests/tickets/Ticket2209OL.java
index 244275636b..620fed1021 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2209OL.java
+++ b/src/com/vaadin/tests/tickets/Ticket2209OL.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2209OL extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2209OL2.java b/src/com/vaadin/tests/tickets/Ticket2209OL2.java
index 4ae53aec15..5f250b7976 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2209OL2.java
+++ b/src/com/vaadin/tests/tickets/Ticket2209OL2.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2209OL2 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2215.java b/src/com/vaadin/tests/tickets/Ticket2215.java
index d5a786a59b..51b0236ad0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2215.java
+++ b/src/com/vaadin/tests/tickets/Ticket2215.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
 
 public class Ticket2215 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2221.java b/src/com/vaadin/tests/tickets/Ticket2221.java
index 3f1d60d30d..30d3070043 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2221.java
+++ b/src/com/vaadin/tests/tickets/Ticket2221.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2221 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2222.java b/src/com/vaadin/tests/tickets/Ticket2222.java
index 4cb71e5503..40980fcef2 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2222.java
+++ b/src/com/vaadin/tests/tickets/Ticket2222.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2222 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2227OrderedlayoutInTable.java b/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
index 7b2fd58c1a..a8b4867323 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2227OrderedlayoutInTable.java
+++ b/src/com/vaadin/tests/tickets/Ticket2227OrderedlayoutInTable.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Item;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 public class Ticket2227OrderedlayoutInTable extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2231.java b/src/com/vaadin/tests/tickets/Ticket2231.java
index 5958d6f79b..c9f773a4a4 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2231.java
+++ b/src/com/vaadin/tests/tickets/Ticket2231.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2231 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2232.java b/src/com/vaadin/tests/tickets/Ticket2232.java
index bf27ad3a66..2b33ee39cf 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2232.java
+++ b/src/com/vaadin/tests/tickets/Ticket2232.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Layout.SpacingHandler;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Layout.SpacingHandler;
 
 public class Ticket2232 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2234.java b/src/com/vaadin/tests/tickets/Ticket2234.java
index 32febb1e40..25d74e8574 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2234.java
+++ b/src/com/vaadin/tests/tickets/Ticket2234.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.Item;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2234 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2235.java b/src/com/vaadin/tests/tickets/Ticket2235.java
index 2a0b508fae..98c618453d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2235.java
+++ b/src/com/vaadin/tests/tickets/Ticket2235.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2235 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2240.java b/src/com/vaadin/tests/tickets/Ticket2240.java
index c5e7dd9f9b..e28a463eed 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2240.java
+++ b/src/com/vaadin/tests/tickets/Ticket2240.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2240 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2242.java b/src/com/vaadin/tests/tickets/Ticket2242.java
index 398b95a367..0c1bf21a3f 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2242.java
+++ b/src/com/vaadin/tests/tickets/Ticket2242.java
@@ -1,17 +1,17 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+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.data.util.ObjectProperty;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2242 extends Application implements ValueChangeListener {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2244.java b/src/com/vaadin/tests/tickets/Ticket2244.java
index aa3c38182b..4631f63cc4 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2244.java
+++ b/src/com/vaadin/tests/tickets/Ticket2244.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.FormLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket2244 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2245.java b/src/com/vaadin/tests/tickets/Ticket2245.java
index 816a191b20..8232b7bc38 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2245.java
+++ b/src/com/vaadin/tests/tickets/Ticket2245.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.Window;
 
 public class Ticket2245 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2267.java b/src/com/vaadin/tests/tickets/Ticket2267.java
index 85502a01af..2ccbce604a 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2267.java
+++ b/src/com/vaadin/tests/tickets/Ticket2267.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2267 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2271.java b/src/com/vaadin/tests/tickets/Ticket2271.java
index 93fec7c053..50a5466645 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2271.java
+++ b/src/com/vaadin/tests/tickets/Ticket2271.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComboBox;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2271 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2279.java b/src/com/vaadin/tests/tickets/Ticket2279.java
index f7889c599f..06f2cb9348 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2279.java
+++ b/src/com/vaadin/tests/tickets/Ticket2279.java
@@ -1,19 +1,19 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.gwt.client.ui.AlignmentInfo;
-import com.itmill.toolkit.ui.AbstractOrderedLayout;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Layout.AlignmentHandler;
+import com.vaadin.Application;
+import com.vaadin.terminal.gwt.client.ui.AlignmentInfo;
+import com.vaadin.ui.AbstractOrderedLayout;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Layout.AlignmentHandler;
 
 public class Ticket2279 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2282.java b/src/com/vaadin/tests/tickets/Ticket2282.java
index 45025bb947..1e5924fced 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2282.java
+++ b/src/com/vaadin/tests/tickets/Ticket2282.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.FormLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket2282 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2283.java b/src/com/vaadin/tests/tickets/Ticket2283.java
index be65141da1..6504355676 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2283.java
+++ b/src/com/vaadin/tests/tickets/Ticket2283.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Layout.AlignmentHandler;
+import com.vaadin.Application;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Layout.AlignmentHandler;
 
 public class Ticket2283 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2287.java b/src/com/vaadin/tests/tickets/Ticket2287.java
index 56c542ceaf..cd6770e156 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2287.java
+++ b/src/com/vaadin/tests/tickets/Ticket2287.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.net.URL;
 
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 public class Ticket2287 extends Ticket2292 {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2289.java b/src/com/vaadin/tests/tickets/Ticket2289.java
index abce7f512f..bd92311f73 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2289.java
+++ b/src/com/vaadin/tests/tickets/Ticket2289.java
@@ -1,16 +1,16 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Accordion;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.CustomComponent;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Accordion;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket2289 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2292.java b/src/com/vaadin/tests/tickets/Ticket2292.java
index 4967c247da..9cd448a5c7 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2292.java
+++ b/src/com/vaadin/tests/tickets/Ticket2292.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.awt.Color;
 import java.awt.Graphics;
@@ -10,15 +10,15 @@ import java.net.URL;
 
 import javax.imageio.ImageIO;
 
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CheckBox;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Window;
 
-public class Ticket2292 extends com.itmill.toolkit.Application {
+public class Ticket2292 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2294.java b/src/com/vaadin/tests/tickets/Ticket2294.java
index 8ee96c8827..f6c8a14420 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2294.java
+++ b/src/com/vaadin/tests/tickets/Ticket2294.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Layout.AlignmentHandler;
+import com.vaadin.Application;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Layout.AlignmentHandler;
 
 public class Ticket2294 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2296.java b/src/com/vaadin/tests/tickets/Ticket2296.java
index 99d61acc79..e4eb3e7a1d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2296.java
+++ b/src/com/vaadin/tests/tickets/Ticket2296.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2296 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2297.java b/src/com/vaadin/tests/tickets/Ticket2297.java
index c8e91d6e2a..48265ded63 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2297.java
+++ b/src/com/vaadin/tests/tickets/Ticket2297.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URL;
 
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 public class Ticket2297 extends Ticket2292 {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2303.java b/src/com/vaadin/tests/tickets/Ticket2303.java
index 11caa10e2a..927358723d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2303.java
+++ b/src/com/vaadin/tests/tickets/Ticket2303.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2303 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2304.java b/src/com/vaadin/tests/tickets/Ticket2304.java
index 2a5e4a31e1..57c7acefc1 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2304.java
+++ b/src/com/vaadin/tests/tickets/Ticket2304.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
 
 public class Ticket2304 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2310.java b/src/com/vaadin/tests/tickets/Ticket2310.java
index d00a63ea3a..3318456afa 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2310.java
+++ b/src/com/vaadin/tests/tickets/Ticket2310.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket2310 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2319.java b/src/com/vaadin/tests/tickets/Ticket2319.java
index 2b7b68d337..9d61a27613 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2319.java
+++ b/src/com/vaadin/tests/tickets/Ticket2319.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2319 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2323.java b/src/com/vaadin/tests/tickets/Ticket2323.java
index e1dd789b9e..4def857112 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2323.java
+++ b/src/com/vaadin/tests/tickets/Ticket2323.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.Window;
 
 public class Ticket2323 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2325.java b/src/com/vaadin/tests/tickets/Ticket2325.java
index e4b57e2cbb..3b46d89a5e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2325.java
+++ b/src/com/vaadin/tests/tickets/Ticket2325.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2325 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2329.java b/src/com/vaadin/tests/tickets/Ticket2329.java
index 5ca919cc6f..c55ab9cac5 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2329.java
+++ b/src/com/vaadin/tests/tickets/Ticket2329.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Table.ColumnGenerator;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Table.ColumnGenerator;
 
 public class Ticket2329 extends Application {
     private Table table;
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2337.java b/src/com/vaadin/tests/tickets/Ticket2337.java
index 648c88a391..aae4807277 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2337.java
+++ b/src/com/vaadin/tests/tickets/Ticket2337.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket2337 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2339.java b/src/com/vaadin/tests/tickets/Ticket2339.java
index f9b3ee4d5a..6476807ada 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2339.java
+++ b/src/com/vaadin/tests/tickets/Ticket2339.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2339 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2341.java b/src/com/vaadin/tests/tickets/Ticket2341.java
index 0bc40e51cf..b6dd4cc1f0 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2341.java
+++ b/src/com/vaadin/tests/tickets/Ticket2341.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.data.Item;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
-public class Ticket2341 extends com.itmill.toolkit.Application {
+public class Ticket2341 extends com.vaadin.Application {
     @Override
     public void init() {
         Window main = new Window();
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2344.java b/src/com/vaadin/tests/tickets/Ticket2344.java
index ec4bb14a86..cb36fbca9e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2344.java
+++ b/src/com/vaadin/tests/tickets/Ticket2344.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.Random;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2344 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2347.java b/src/com/vaadin/tests/tickets/Ticket2347.java
index 6a0ccbea7d..08e1aae34c 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2347.java
+++ b/src/com/vaadin/tests/tickets/Ticket2347.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.CustomLayout;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2347 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2364.java b/src/com/vaadin/tests/tickets/Ticket2364.java
index 814f424fa4..7f7290dd80 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2364.java
+++ b/src/com/vaadin/tests/tickets/Ticket2364.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2364 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2365.java b/src/com/vaadin/tests/tickets/Ticket2365.java
index e02a6636f5..1fee955e6b 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2365.java
+++ b/src/com/vaadin/tests/tickets/Ticket2365.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket2365 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2398.java b/src/com/vaadin/tests/tickets/Ticket2398.java
index b80b68cdfd..dee0417eff 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2398.java
+++ b/src/com/vaadin/tests/tickets/Ticket2398.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 public class Ticket2398 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2404.java b/src/com/vaadin/tests/tickets/Ticket2404.java
index 4e39e6f423..478d8b7786 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2404.java
+++ b/src/com/vaadin/tests/tickets/Ticket2404.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2404 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2405.java b/src/com/vaadin/tests/tickets/Ticket2405.java
index 6d0ac22745..0138223db8 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2405.java
+++ b/src/com/vaadin/tests/tickets/Ticket2405.java
@@ -1,15 +1,15 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.SplitPanel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.SplitPanel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2405 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2406.java b/src/com/vaadin/tests/tickets/Ticket2406.java
index e2239a92e8..b4f8ec77cf 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2406.java
+++ b/src/com/vaadin/tests/tickets/Ticket2406.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class Ticket2406 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2407.java b/src/com/vaadin/tests/tickets/Ticket2407.java
index ee8c090f47..e095bb294c 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2407.java
+++ b/src/com/vaadin/tests/tickets/Ticket2407.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
 
-public class Ticket2407 extends com.itmill.toolkit.Application {
+public class Ticket2407 extends com.vaadin.Application {
 
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2411.java b/src/com/vaadin/tests/tickets/Ticket2411.java
index b7690c375f..b402ced300 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2411.java
+++ b/src/com/vaadin/tests/tickets/Ticket2411.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Window;
 
 public class Ticket2411 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2415.java b/src/com/vaadin/tests/tickets/Ticket2415.java
index b90cf88db2..5c1d0c2a51 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2415.java
+++ b/src/com/vaadin/tests/tickets/Ticket2415.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Property.ValueChangeEvent;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket2415 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2420.java b/src/com/vaadin/tests/tickets/Ticket2420.java
index 01302a8607..e40d73877c 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2420.java
+++ b/src/com/vaadin/tests/tickets/Ticket2420.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.ProgressIndicator;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.ui.Window;
 
 public class Ticket2420 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2425.java b/src/com/vaadin/tests/tickets/Ticket2425.java
index 7cdd0dbd76..75810137ad 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2425.java
+++ b/src/com/vaadin/tests/tickets/Ticket2425.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.Window;
 
 public class Ticket2425 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2426.java b/src/com/vaadin/tests/tickets/Ticket2426.java
index 6519d940b6..bbad5ef686 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2426.java
+++ b/src/com/vaadin/tests/tickets/Ticket2426.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 public class Ticket2426 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2431.java b/src/com/vaadin/tests/tickets/Ticket2431.java
index 16e2d118b8..5ab8486663 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2431.java
+++ b/src/com/vaadin/tests/tickets/Ticket2431.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.event.ShortcutAction;
-import com.itmill.toolkit.event.Action.Handler;
-import com.itmill.toolkit.event.ShortcutAction.KeyCode;
-import com.itmill.toolkit.event.ShortcutAction.ModifierKey;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Window;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.event.Action;
+import com.vaadin.event.ShortcutAction;
+import com.vaadin.event.Action.Handler;
+import com.vaadin.event.ShortcutAction.KeyCode;
+import com.vaadin.event.ShortcutAction.ModifierKey;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Window;
 
 public class Ticket2431 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2432.java b/src/com/vaadin/tests/tickets/Ticket2432.java
index 8897f0ccec..635a356e49 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2432.java
+++ b/src/com/vaadin/tests/tickets/Ticket2432.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Alignment;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Layout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Layout.AlignmentHandler;
-import com.itmill.toolkit.ui.Layout.SpacingHandler;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Layout.AlignmentHandler;
+import com.vaadin.ui.Layout.SpacingHandler;
 
 public class Ticket2432 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2434.java b/src/com/vaadin/tests/tickets/Ticket2434.java
index 6c0e78343b..5d4a884895 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2434.java
+++ b/src/com/vaadin/tests/tickets/Ticket2434.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.tests.TestForTablesInitialColumnWidthLogicRendering;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Window;
 
 public class Ticket2434 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2436.java b/src/com/vaadin/tests/tickets/Ticket2436.java
index 149013d86b..0d6a4a1444 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2436.java
+++ b/src/com/vaadin/tests/tickets/Ticket2436.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.PopupView;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.PopupView;
+import com.vaadin.ui.Window;
 
 public class Ticket2436 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2440.java b/src/com/vaadin/tests/tickets/Ticket2440.java
index 889e02e1c4..16b8c3e707 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2440.java
+++ b/src/com/vaadin/tests/tickets/Ticket2440.java
@@ -1,14 +1,14 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.net.URL;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.URIHandler;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.URIHandler;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.Window;
 
 public class Ticket2440 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2526.java b/src/com/vaadin/tests/tickets/Ticket2526.java
index 6f3e5140a1..05528ef086 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2526.java
+++ b/src/com/vaadin/tests/tickets/Ticket2526.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket2526 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket2742.java b/src/com/vaadin/tests/tickets/Ticket2742.java
index 77ab797035..11eb01e051 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket2742.java
+++ b/src/com/vaadin/tests/tickets/Ticket2742.java
@@ -1,12 +1,12 @@
 /**
  * 
  */
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.HorizontalLayout;
-import com.itmill.toolkit.ui.NativeSelect;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.Window;
 
 /**
  * @author Risto Yrjänä / IT Mill Ltd.
@@ -17,7 +17,7 @@ public class Ticket2742 extends Application {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.Application#init()
+     * @see com.vaadin.Application#init()
      */
     @Override
     public void init() {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket34.java b/src/com/vaadin/tests/tickets/Ticket34.java
index 3b61554ab2..beb6813d4d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket34.java
+++ b/src/com/vaadin/tests/tickets/Ticket34.java
@@ -1,19 +1,19 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.UriFragmentUtility;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.UriFragmentUtility.FragmentChangedEvent;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.UriFragmentUtility;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.UriFragmentUtility.FragmentChangedEvent;
 
 public class Ticket34 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket677.java b/src/com/vaadin/tests/tickets/Ticket677.java
index bba928173a..ab945a2d8e 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket677.java
+++ b/src/com/vaadin/tests/tickets/Ticket677.java
@@ -1,24 +1,24 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.ui.BaseFieldFactory;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Component;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.Field;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Table;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.ui.BaseFieldFactory;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.Field;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket677 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket695.java b/src/com/vaadin/tests/tickets/Ticket695.java
index c37ee50c51..a328133014 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket695.java
+++ b/src/com/vaadin/tests/tickets/Ticket695.java
@@ -1,13 +1,13 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 @SuppressWarnings("serial")
 public class Ticket695 extends Application {
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket736.java b/src/com/vaadin/tests/tickets/Ticket736.java
index 8c4993f7ae..bc31c5b75d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket736.java
+++ b/src/com/vaadin/tests/tickets/Ticket736.java
@@ -1,18 +1,18 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.data.util.MethodProperty;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ExpandLayout;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Validator;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.data.util.MethodProperty;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ExpandLayout;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket736 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket846.java b/src/com/vaadin/tests/tickets/Ticket846.java
index d7c72b8d86..888906105d 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket846.java
+++ b/src/com/vaadin/tests/tickets/Ticket846.java
@@ -1,11 +1,11 @@
-package com.itmill.toolkit.tests.tickets;
+package com.vaadin.tests.tickets;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.util.MethodProperty;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.Application;
+import com.vaadin.data.Validator;
+import com.vaadin.data.util.MethodProperty;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
 
 public class Ticket846 extends Application {
 
@@ -51,7 +51,7 @@ public class Ticket846 extends Application {
         mainWin.addComponent(new Button("Validate integer",
                 new Button.ClickListener() {
                     public void buttonClick(
-                            com.itmill.toolkit.ui.Button.ClickEvent event) {
+                            com.vaadin.ui.Button.ClickEvent event) {
                         mainWin.showNotification("The field is "
                                 + (tx.isValid() ? "" : "not ") + "valid");
                     };
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket932.java b/src/com/vaadin/tests/tickets/Ticket932.java
index 39dfe032cd..6a8a459042 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket932.java
+++ b/src/com/vaadin/tests/tickets/Ticket932.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.tests.tickets;
-
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.RichTextArea;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.Window;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class Ticket932 extends Application {
 
diff --git a/src/com/itmill/toolkit/tests/util/LogPrintWriter.java b/src/com/vaadin/tests/util/LogPrintWriter.java
index 3e95060c3f..1f07a9c7ae 100644
--- a/src/com/itmill/toolkit/tests/util/LogPrintWriter.java
+++ b/src/com/vaadin/tests/util/LogPrintWriter.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.tests.util;
+package com.vaadin.tests.util;
 
 import java.io.PrintWriter;
 import java.io.Writer;
diff --git a/src/com/itmill/toolkit/tests/util/RandomComponents.java b/src/com/vaadin/tests/util/RandomComponents.java
index 3c61c56f31..5b98e5dd66 100644
--- a/src/com/itmill/toolkit/tests/util/RandomComponents.java
+++ b/src/com/vaadin/tests/util/RandomComponents.java
@@ -1,42 +1,42 @@
-package com.itmill.toolkit.tests.util;
+package com.vaadin.tests.util;
 
 import java.util.ArrayList;
 import java.util.Random;
 
-import com.itmill.toolkit.automatedtests.util.MultiListener;
-import com.itmill.toolkit.data.Container.ItemSetChangeListener;
-import com.itmill.toolkit.data.Container.PropertySetChangeListener;
-import com.itmill.toolkit.data.Property.ValueChangeListener;
-import com.itmill.toolkit.demo.featurebrowser.ButtonExample;
-import com.itmill.toolkit.demo.featurebrowser.ClientCachingExample;
-import com.itmill.toolkit.demo.featurebrowser.ComboBoxExample;
-import com.itmill.toolkit.demo.featurebrowser.EmbeddedBrowserExample;
-import com.itmill.toolkit.demo.featurebrowser.JavaScriptAPIExample;
-import com.itmill.toolkit.demo.featurebrowser.LabelExample;
-import com.itmill.toolkit.demo.featurebrowser.LayoutExample;
-import com.itmill.toolkit.demo.featurebrowser.NotificationExample;
-import com.itmill.toolkit.demo.featurebrowser.RichTextExample;
-import com.itmill.toolkit.demo.featurebrowser.SelectExample;
-import com.itmill.toolkit.demo.featurebrowser.TableExample;
-import com.itmill.toolkit.demo.featurebrowser.TreeExample;
-import com.itmill.toolkit.demo.featurebrowser.ValueInputExample;
-import com.itmill.toolkit.demo.featurebrowser.WindowingExample;
-import com.itmill.toolkit.terminal.ExternalResource;
-import com.itmill.toolkit.terminal.ThemeResource;
-import com.itmill.toolkit.tests.StressComponentsInTable;
-import com.itmill.toolkit.ui.AbstractComponent;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.ComponentContainer;
-import com.itmill.toolkit.ui.DateField;
-import com.itmill.toolkit.ui.Embedded;
-import com.itmill.toolkit.ui.GridLayout;
-import com.itmill.toolkit.ui.Label;
-import com.itmill.toolkit.ui.Link;
-import com.itmill.toolkit.ui.OrderedLayout;
-import com.itmill.toolkit.ui.Panel;
-import com.itmill.toolkit.ui.Select;
-import com.itmill.toolkit.ui.TabSheet;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.automatedtests.util.MultiListener;
+import com.vaadin.data.Container.ItemSetChangeListener;
+import com.vaadin.data.Container.PropertySetChangeListener;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.demo.featurebrowser.ButtonExample;
+import com.vaadin.demo.featurebrowser.ClientCachingExample;
+import com.vaadin.demo.featurebrowser.ComboBoxExample;
+import com.vaadin.demo.featurebrowser.EmbeddedBrowserExample;
+import com.vaadin.demo.featurebrowser.JavaScriptAPIExample;
+import com.vaadin.demo.featurebrowser.LabelExample;
+import com.vaadin.demo.featurebrowser.LayoutExample;
+import com.vaadin.demo.featurebrowser.NotificationExample;
+import com.vaadin.demo.featurebrowser.RichTextExample;
+import com.vaadin.demo.featurebrowser.SelectExample;
+import com.vaadin.demo.featurebrowser.TableExample;
+import com.vaadin.demo.featurebrowser.TreeExample;
+import com.vaadin.demo.featurebrowser.ValueInputExample;
+import com.vaadin.demo.featurebrowser.WindowingExample;
+import com.vaadin.terminal.ExternalResource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.tests.StressComponentsInTable;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.Embedded;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.OrderedLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TextField;
 
 public class RandomComponents {
 
diff --git a/src/com/itmill/toolkit/tests/util/TestClickListener.java b/src/com/vaadin/tests/util/TestClickListener.java
index 18de177ddd..730452ac72 100644
--- a/src/com/itmill/toolkit/tests/util/TestClickListener.java
+++ b/src/com/vaadin/tests/util/TestClickListener.java
@@ -1,9 +1,9 @@
-package com.itmill.toolkit.tests.util;
+package com.vaadin.tests.util;
 
 import java.util.HashMap;
 
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
 
 public class TestClickListener implements Button.ClickListener {
 
diff --git a/src/com/itmill/toolkit/tests/validation/RequiredErrorMessage.java b/src/com/vaadin/tests/validation/RequiredErrorMessage.java
index 700d66ee74..7f5048bd80 100644
--- a/src/com/itmill/toolkit/tests/validation/RequiredErrorMessage.java
+++ b/src/com/vaadin/tests/validation/RequiredErrorMessage.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.tests.validation;
+package com.vaadin.tests.validation;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Window;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
 
 public class RequiredErrorMessage extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/validation/RequiredIndicatorForReadOnly.java b/src/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
index 72f85bf3a2..6e806b60f4 100644
--- a/src/com/itmill/toolkit/tests/validation/RequiredIndicatorForReadOnly.java
+++ b/src/com/vaadin/tests/validation/RequiredIndicatorForReadOnly.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.tests.validation;
+package com.vaadin.tests.validation;
 
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.TextField;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.TextField;
 
 public class RequiredIndicatorForReadOnly extends TestBase {
 
diff --git a/src/com/itmill/toolkit/tests/validation/TestValidators.java b/src/com/vaadin/tests/validation/TestValidators.java
index 2a75bdd406..75eaa61ce4 100644
--- a/src/com/itmill/toolkit/tests/validation/TestValidators.java
+++ b/src/com/vaadin/tests/validation/TestValidators.java
@@ -1,21 +1,21 @@
-package com.itmill.toolkit.tests.validation;
-
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.validator.AbstractStringValidator;
-import com.itmill.toolkit.data.validator.CompositeValidator;
-import com.itmill.toolkit.data.validator.DoubleValidator;
-import com.itmill.toolkit.data.validator.EmailValidator;
-import com.itmill.toolkit.data.validator.IntegerValidator;
-import com.itmill.toolkit.data.validator.RegexpValidator;
-import com.itmill.toolkit.data.validator.StringLengthValidator;
-import com.itmill.toolkit.tests.components.TestBase;
-import com.itmill.toolkit.ui.Button;
-import com.itmill.toolkit.ui.Form;
-import com.itmill.toolkit.ui.TextField;
-import com.itmill.toolkit.ui.VerticalLayout;
-import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.ui.Button.ClickListener;
-import com.itmill.toolkit.ui.Window.Notification;
+package com.vaadin.tests.validation;
+
+import com.vaadin.data.Validator;
+import com.vaadin.data.validator.AbstractStringValidator;
+import com.vaadin.data.validator.CompositeValidator;
+import com.vaadin.data.validator.DoubleValidator;
+import com.vaadin.data.validator.EmailValidator;
+import com.vaadin.data.validator.IntegerValidator;
+import com.vaadin.data.validator.RegexpValidator;
+import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Form;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Window.Notification;
 
 public class TestValidators extends TestBase {
 
diff --git a/src/com/itmill/toolkit/ui/AbsoluteLayout.java b/src/com/vaadin/ui/AbsoluteLayout.java
index fbac344932..cf3f62eee4 100644
--- a/src/com/itmill/toolkit/ui/AbsoluteLayout.java
+++ b/src/com/vaadin/ui/AbsoluteLayout.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -7,9 +7,9 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.gwt.client.ui.IAbsoluteLayout;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.gwt.client.ui.IAbsoluteLayout;
 
 /**
  * AbsoluteLayout is a layout implementation that mimics html absolute
diff --git a/src/com/itmill/toolkit/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java
index f067b52b88..b26278b016 100644
--- a/src/com/itmill/toolkit/ui/AbstractComponent.java
+++ b/src/com/vaadin/ui/AbstractComponent.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -15,15 +15,15 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.event.EventRouter;
-import com.itmill.toolkit.event.MethodEventSource;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.Terminal;
-import com.itmill.toolkit.terminal.gwt.server.ComponentSizeValidator;
+import com.vaadin.Application;
+import com.vaadin.event.EventRouter;
+import com.vaadin.event.MethodEventSource;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.Terminal;
+import com.vaadin.terminal.gwt.server.ComponentSizeValidator;
 
 /**
  * An abstract class that defines default implementation for the
@@ -173,7 +173,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /**
      * Sets and replaces all previous style names of the component. This method
      * will trigger a
-     * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent
+     * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent
      * RepaintRequestEvent}.
      * 
      * @param style
@@ -253,7 +253,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /**
      * Sets the component's caption <code>String</code>. Caption is the visible
      * name of the component. This method will trigger a
-     * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent
+     * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent
      * RepaintRequestEvent}.
      * 
      * @param caption
@@ -302,7 +302,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
 
     /**
      * Sets the component's icon. This method will trigger a
-     * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent
+     * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent
      * RepaintRequestEvent}.
      * 
      * @param icon
@@ -348,7 +348,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /**
      * Sets the component's immediate mode to the specified status. This method
      * will trigger a
-     * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent
+     * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent
      * RepaintRequestEvent}.
      * 
      * @param immediate
@@ -364,7 +364,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Component#isVisible()
+     * @see com.vaadin.ui.Component#isVisible()
      */
     public boolean isVisible() {
         return visible && (getParent() == null || getParent().isVisible());
@@ -373,7 +373,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Component#setVisible(boolean)
+     * @see com.vaadin.ui.Component#setVisible(boolean)
      */
     public void setVisible(boolean visible) {
 
@@ -450,7 +450,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /**
      * Sets the component's description. See {@link #getDescription()} for more
      * information on what the description is. This method will trigger a
-     * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent
+     * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent
      * RepaintRequestEvent}.
      * 
      * @param description
@@ -817,7 +817,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
      * 
      * <p>
      * For more information on the inheritable event mechanism see the
-     * {@link com.itmill.toolkit.event com.itmill.toolkit.event package
+     * {@link com.vaadin.event com.vaadin.event package
      * documentation}.
      * </p>
      * 
@@ -853,14 +853,14 @@ public abstract class AbstractComponent implements Component, MethodEventSource
      * 
      * <p>
      * For more information on the inheritable event mechanism see the
-     * {@link com.itmill.toolkit.event com.itmill.toolkit.event package
+     * {@link com.vaadin.event com.vaadin.event package
      * documentation}.
      * </p>
      * 
      * <p>
      * Note: Using this method is discouraged because it cannot be checked
      * during compilation. Use {@link #addListener(Class, Object, Method)} or
-     * {@link #addListener(com.itmill.toolkit.ui.Component.Listener)} instead.
+     * {@link #addListener(com.vaadin.ui.Component.Listener)} instead.
      * </p>
      * 
      * @param eventType
@@ -887,7 +887,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
      * 
      * <p>
      * For more information on the inheritable event mechanism see the
-     * {@link com.itmill.toolkit.event com.itmill.toolkit.event package
+     * {@link com.vaadin.event com.vaadin.event package
      * documentation}.
      * </p>
      * 
@@ -910,7 +910,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
      * 
      * <p>
      * For more information on the inheritable event mechanism see the
-     * {@link com.itmill.toolkit.event com.itmill.toolkit.event package
+     * {@link com.vaadin.event com.vaadin.event package
      * documentation}.
      * </p>
      * 
@@ -945,7 +945,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
      * 
      * <p>
      * For more information on the inheritable event mechanism see the
-     * {@link com.itmill.toolkit.event com.itmill.toolkit.event package
+     * {@link com.vaadin.event com.vaadin.event package
      * documentation}.
      * </p>
      * 
@@ -1048,7 +1048,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#getHeight()
+     * @see com.vaadin.terminal.Sizeable#getHeight()
      */
     public float getHeight() {
         return height;
@@ -1057,7 +1057,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#getHeightUnits()
+     * @see com.vaadin.terminal.Sizeable#getHeightUnits()
      */
     public int getHeightUnits() {
         return heightUnit;
@@ -1066,7 +1066,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#getWidth()
+     * @see com.vaadin.terminal.Sizeable#getWidth()
      */
     public float getWidth() {
         return width;
@@ -1075,7 +1075,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#getWidthUnits()
+     * @see com.vaadin.terminal.Sizeable#getWidthUnits()
      */
     public int getWidthUnits() {
         return widthUnit;
@@ -1084,7 +1084,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setHeight(float)
+     * @see com.vaadin.terminal.Sizeable#setHeight(float)
      */
     @Deprecated
     public void setHeight(float height) {
@@ -1094,7 +1094,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setHeightUnits(int)
+     * @see com.vaadin.terminal.Sizeable#setHeightUnits(int)
      */
     @Deprecated
     public void setHeightUnits(int unit) {
@@ -1104,7 +1104,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setHeight(float, int)
+     * @see com.vaadin.terminal.Sizeable#setHeight(float, int)
      */
     public void setHeight(float height, int unit) {
         this.height = height;
@@ -1116,7 +1116,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setSizeFull()
+     * @see com.vaadin.terminal.Sizeable#setSizeFull()
      */
     public void setSizeFull() {
         setWidth(100, UNITS_PERCENTAGE);
@@ -1126,7 +1126,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setSizeUndefined()
+     * @see com.vaadin.terminal.Sizeable#setSizeUndefined()
      */
     public void setSizeUndefined() {
         setWidth(-1, UNITS_PIXELS);
@@ -1136,7 +1136,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setWidth(float)
+     * @see com.vaadin.terminal.Sizeable#setWidth(float)
      */
     @Deprecated
     public void setWidth(float width) {
@@ -1146,7 +1146,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setWidthUnits(int)
+     * @see com.vaadin.terminal.Sizeable#setWidthUnits(int)
      */
     @Deprecated
     public void setWidthUnits(int unit) {
@@ -1156,7 +1156,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setWidth(float, int)
+     * @see com.vaadin.terminal.Sizeable#setWidth(float, int)
      */
     public void setWidth(float width, int unit) {
         this.width = width;
@@ -1168,7 +1168,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setWidth(java.lang.String)
+     * @see com.vaadin.terminal.Sizeable#setWidth(java.lang.String)
      */
     public void setWidth(String width) {
         float[] p = parseStringSize(width);
@@ -1178,7 +1178,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.terminal.Sizeable#setHeight(java.lang.String)
+     * @see com.vaadin.terminal.Sizeable#setHeight(java.lang.String)
      */
     public void setHeight(String height) {
         float[] p = parseStringSize(height);
diff --git a/src/com/itmill/toolkit/ui/AbstractComponentContainer.java b/src/com/vaadin/ui/AbstractComponentContainer.java
index b46117d115..517dff14ac 100644
--- a/src/com/itmill/toolkit/ui/AbstractComponentContainer.java
+++ b/src/com/vaadin/ui/AbstractComponentContainer.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.lang.reflect.Method;
 import java.util.Iterator;
@@ -70,7 +70,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
      * Notifies all contained components that the container is attached to a
      * window.
      * 
-     * @see com.itmill.toolkit.ui.Component#attach()
+     * @see com.vaadin.ui.Component#attach()
      */
     @Override
     public void attach() {
@@ -85,7 +85,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
      * Notifies all contained components that the container is detached from a
      * window.
      * 
-     * @see com.itmill.toolkit.ui.Component#detach()
+     * @see com.vaadin.ui.Component#detach()
      */
     @Override
     public void detach() {
@@ -170,7 +170,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
      * classes must implement component list maintenance and call this method
      * after component list maintenance.
      * 
-     * @see com.itmill.toolkit.ui.ComponentContainer#addComponent(Component)
+     * @see com.vaadin.ui.ComponentContainer#addComponent(Component)
      */
     public void addComponent(Component c) {
         if (c instanceof ComponentContainer) {
@@ -200,7 +200,7 @@ public abstract class AbstractComponentContainer extends AbstractComponent
      * classes must implement component list maintenance and call this method
      * before component list maintenance.
      * 
-     * @see com.itmill.toolkit.ui.ComponentContainer#removeComponent(Component)
+     * @see com.vaadin.ui.ComponentContainer#removeComponent(Component)
      */
     public void removeComponent(Component c) {
         if (c.getParent() == this) {
diff --git a/src/com/itmill/toolkit/ui/AbstractField.java b/src/com/vaadin/ui/AbstractField.java
index 3cbc788d6b..9d1420a78d 100644
--- a/src/com/itmill/toolkit/ui/AbstractField.java
+++ b/src/com/vaadin/ui/AbstractField.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -13,35 +13,35 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.data.Buffered;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Validatable;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.Validator.InvalidValueException;
-import com.itmill.toolkit.terminal.CompositeErrorMessage;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.Application;
+import com.vaadin.data.Buffered;
+import com.vaadin.data.Property;
+import com.vaadin.data.Validatable;
+import com.vaadin.data.Validator;
+import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.terminal.CompositeErrorMessage;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * <p>
  * Abstract field component for implementing buffered property editors. The
  * field may hold an internal value, or it may be connected to any data source
- * that implements the {@link com.itmill.toolkit.data.Property}interface.
+ * that implements the {@link com.vaadin.data.Property}interface.
  * <code>AbstractField</code> implements that interface itself, too, so
  * accessing the Property value represented by it is straightforward.
  * </p>
  * 
  * <p>
- * AbstractField also provides the {@link com.itmill.toolkit.data.Buffered}
+ * AbstractField also provides the {@link com.vaadin.data.Buffered}
  * interface for buffering the data source value. By default the Field is in
  * write through-mode and {@link #setWriteThrough(boolean)}should be called to
  * enable buffering.
  * </p>
  * 
  * <p>
- * The class also supports {@link com.itmill.toolkit.data.Validator validators}
+ * The class also supports {@link com.vaadin.data.Validator validators}
  * to make sure the value contained in the field is valid.
  * </p>
  * 
@@ -174,7 +174,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     /**
      * Changes the readonly state and throw read-only status change events.
      * 
-     * @see com.itmill.toolkit.ui.Component#setReadOnly(boolean)
+     * @see com.vaadin.ui.Component#setReadOnly(boolean)
      */
     @Override
     public void setReadOnly(boolean readOnly) {
@@ -185,7 +185,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     /**
      * Tests if the invalid data is committed to datasource.
      * 
-     * @see com.itmill.toolkit.data.BufferedValidatable#isInvalidCommitted()
+     * @see com.vaadin.data.BufferedValidatable#isInvalidCommitted()
      */
     public boolean isInvalidCommitted() {
         return invalidCommitted;
@@ -194,7 +194,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     /**
      * Sets if the invalid data should be committed to datasource.
      * 
-     * @see com.itmill.toolkit.data.BufferedValidatable#setInvalidCommitted(boolean)
+     * @see com.vaadin.data.BufferedValidatable#setInvalidCommitted(boolean)
      */
     public void setInvalidCommitted(boolean isCommitted) {
         invalidCommitted = isCommitted;
@@ -671,7 +671,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
      * is required, but empty, validation will throw an EmptyValueException with
      * the error message set with setRequiredError().
      * 
-     * @see com.itmill.toolkit.data.Validatable#validate()
+     * @see com.vaadin.data.Validatable#validate()
      */
     public void validate() throws Validator.InvalidValueException {
 
@@ -736,7 +736,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
      * because the field otherwise visually forget the user input immediately.
      * 
      * @return true iff the invalid values are allowed.
-     * @see com.itmill.toolkit.data.Validatable#isInvalidAllowed()
+     * @see com.vaadin.data.Validatable#isInvalidAllowed()
      */
     public boolean isInvalidAllowed() {
         return invalidAllowed;
@@ -753,7 +753,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
      * datasource is set.
      * </p>
      * 
-     * @see com.itmill.toolkit.data.Validatable#setInvalidAllowed(boolean)
+     * @see com.vaadin.data.Validatable#setInvalidAllowed(boolean)
      */
     public void setInvalidAllowed(boolean invalidAllowed)
             throws UnsupportedOperationException {
@@ -765,7 +765,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
      * thrown by the superclasses (that is the component error message),
      * validation errors and buffered source errors.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#getErrorMessage()
+     * @see com.vaadin.ui.AbstractComponent#getErrorMessage()
      */
     @Override
     public ErrorMessage getErrorMessage() {
@@ -948,7 +948,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Component.Focusable#focus()
+     * @see com.vaadin.ui.Component.Focusable#focus()
      */
     public void focus() {
         final Application app = getApplication();
@@ -997,7 +997,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Component.Focusable#getTabIndex()
+     * @see com.vaadin.ui.Component.Focusable#getTabIndex()
      */
     public int getTabIndex() {
         return tabIndex;
@@ -1006,7 +1006,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Component.Focusable#setTabIndex(int)
+     * @see com.vaadin.ui.Component.Focusable#setTabIndex(int)
      */
     public void setTabIndex(int tabIndex) {
         this.tabIndex = tabIndex;
@@ -1031,7 +1031,7 @@ public abstract class AbstractField extends AbstractComponent implements Field,
     /**
      * Notifies the component that it is connected to an application.
      * 
-     * @see com.itmill.toolkit.ui.Component#attach()
+     * @see com.vaadin.ui.Component#attach()
      */
     @Override
     public void attach() {
diff --git a/src/com/itmill/toolkit/ui/AbstractLayout.java b/src/com/vaadin/ui/AbstractLayout.java
index 63e70b8350..3604e5ea1d 100644
--- a/src/com/itmill/toolkit/ui/AbstractLayout.java
+++ b/src/com/vaadin/ui/AbstractLayout.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.ui.Layout.MarginHandler;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.ui.Layout.MarginHandler;
 
 /**
  * An abstract class that defines default implementation for the {@link Layout}
@@ -26,7 +26,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#getTag()
+     * @see com.vaadin.ui.AbstractComponent#getTag()
      */
     @Override
     public abstract String getTag();
@@ -34,7 +34,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Layout#setMargin(boolean)
+     * @see com.vaadin.ui.Layout#setMargin(boolean)
      */
     public void setMargin(boolean enabled) {
         margins.setMargins(enabled);
@@ -44,7 +44,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Layout.MarginHandler#getMargin()
+     * @see com.vaadin.ui.Layout.MarginHandler#getMargin()
      */
     public MarginInfo getMargin() {
         return margins;
@@ -53,7 +53,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Layout.MarginHandler#setMargin(MarginInfo)
+     * @see com.vaadin.ui.Layout.MarginHandler#setMargin(MarginInfo)
      */
     public void setMargin(MarginInfo marginInfo) {
         margins.setMargins(marginInfo);
@@ -63,7 +63,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Layout#setMargin(boolean, boolean, boolean,
+     * @see com.vaadin.ui.Layout#setMargin(boolean, boolean, boolean,
      * boolean)
      */
     public void setMargin(boolean topEnabled, boolean rightEnabled,
@@ -78,7 +78,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.ui.AbstractComponent#paintContent(com.itmill.toolkit
+     * com.vaadin.ui.AbstractComponent#paintContent(com.vaadin
      * .terminal.PaintTarget)
      */
     @Override
diff --git a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java
index c544378714..e83a71eeaf 100644
--- a/src/com/itmill/toolkit/ui/AbstractOrderedLayout.java
+++ b/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -10,9 +10,9 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Sizeable;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Sizeable;
 
 @SuppressWarnings("serial")
 public abstract class AbstractOrderedLayout extends AbstractLayout implements
@@ -235,7 +235,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.ui.Layout.AlignmentHandler#setComponentAlignment(com
+     * com.vaadin.ui.Layout.AlignmentHandler#setComponentAlignment(com
      * .itmill.toolkit.ui.Component, int, int)
      */
     public void setComponentAlignment(Component childComponent,
@@ -267,7 +267,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.ui.Layout.AlignmentHandler#getComponentAlignment(com
+     * com.vaadin.ui.Layout.AlignmentHandler#getComponentAlignment(com
      * .itmill.toolkit.ui.Component)
      */
     public Alignment getComponentAlignment(Component childComponent) {
@@ -282,7 +282,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Layout.SpacingHandler#setSpacing(boolean)
+     * @see com.vaadin.ui.Layout.SpacingHandler#setSpacing(boolean)
      */
     public void setSpacing(boolean enabled) {
         spacing = enabled;
@@ -292,7 +292,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Layout.SpacingHandler#isSpacing()
+     * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing()
      */
     @Deprecated
     public boolean isSpacingEnabled() {
@@ -302,7 +302,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Layout.SpacingHandler#isSpacing()
+     * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing()
      */
     public boolean isSpacing() {
         return spacing;
diff --git a/src/com/itmill/toolkit/ui/AbstractSelect.java b/src/com/vaadin/ui/AbstractSelect.java
index 05f08c5a8f..4719a98371 100644
--- a/src/com/itmill/toolkit/ui/AbstractSelect.java
+++ b/src/com/vaadin/ui/AbstractSelect.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -15,20 +15,20 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.terminal.KeyMapper;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Resource;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.terminal.KeyMapper;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Resource;
 
 /**
  * <p>
  * A class representing a selection of items the user has selected in a UI. The
- * set of choices is presented as a set of {@link com.itmill.toolkit.data.Item}s
- * in a {@link com.itmill.toolkit.data.Container}.
+ * set of choices is presented as a set of {@link com.vaadin.data.Item}s
+ * in a {@link com.vaadin.data.Container}.
  * </p>
  * 
  * <p>
@@ -61,7 +61,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Item caption mode: Index of the item is used as caption. The index mode
      * can only be used with the containers implementing the
-     * {@link com.itmill.toolkit.data.Container.Indexed} interface.
+     * {@link com.vaadin.data.Container.Indexed} interface.
      */
     public static final int ITEM_CAPTION_MODE_INDEX = 2;
     /**
@@ -354,7 +354,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Invoked when the value of a variable has changed.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#changeVariables(java.lang.Object,
+     * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
     @Override
@@ -553,7 +553,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Gets the selected item id or in multiselect mode a set of selected ids.
      * 
-     * @see com.itmill.toolkit.ui.AbstractField#getValue()
+     * @see com.vaadin.ui.AbstractField#getValue()
      */
     @Override
     public Object getValue() {
@@ -593,7 +593,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * 
      * @param newValue
      *            the New selected item or collection of selected items.
-     * @see com.itmill.toolkit.ui.AbstractField#setValue(java.lang.Object)
+     * @see com.vaadin.ui.AbstractField#setValue(java.lang.Object)
      */
     @Override
     public void setValue(Object newValue) throws Property.ReadOnlyException,
@@ -618,7 +618,7 @@ public abstract class AbstractSelect extends AbstractField implements
      *            the New selected item or collection of selected items.
      * @param repaintIsNotNeeded
      *            True if caller is sure that repaint is not needed.
-     * @see com.itmill.toolkit.ui.AbstractField#setValue(java.lang.Object,
+     * @see com.vaadin.ui.AbstractField#setValue(java.lang.Object,
      *      java.lang.Boolean)
      */
     @Override
@@ -674,7 +674,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * 
      * @param propertyId
      *            the Id identifying the property.
-     * @see com.itmill.toolkit.data.Container#getType(java.lang.Object)
+     * @see com.vaadin.data.Container#getType(java.lang.Object)
      */
     public Class getType(Object propertyId) {
         return items.getType(propertyId);
@@ -685,7 +685,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * 
      * @return the Number of items in the container.
      * 
-     * @see com.itmill.toolkit.data.Container#size()
+     * @see com.vaadin.data.Container#size()
      */
     public int size() {
         return items.size();
@@ -709,7 +709,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * Gets the Property identified by the given itemId and propertyId from the
      * Container
      * 
-     * @see com.itmill.toolkit.data.Container#getContainerProperty(Object,
+     * @see com.vaadin.data.Container#getContainerProperty(Object,
      *      Object)
      */
     public Property getContainerProperty(Object itemId, Object propertyId) {
@@ -724,7 +724,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * returns false.
      * 
      * @return True if the operation succeeded.
-     * @see com.itmill.toolkit.data.Container#addContainerProperty(java.lang.Object,
+     * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object,
      *      java.lang.Class, java.lang.Object)
      */
     public boolean addContainerProperty(Object propertyId, Class type,
@@ -745,7 +745,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * returns false.
      * 
      * @return True if the operation succeeded.
-     * @see com.itmill.toolkit.data.Container#removeAllItems()
+     * @see com.vaadin.data.Container#removeAllItems()
      */
     public boolean removeAllItems() throws UnsupportedOperationException {
 
@@ -766,7 +766,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * method. if the creation fails, null is returned.
      * 
      * @return the Id of the created item or null in case of failure.
-     * @see com.itmill.toolkit.data.Container#addItem()
+     * @see com.vaadin.data.Container#addItem()
      */
     public Object addItem() throws UnsupportedOperationException {
 
@@ -790,7 +790,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * @param itemId
      *            the Identification of the item to be created.
      * @return the Created item with the given id, or null in case of failure.
-     * @see com.itmill.toolkit.data.Container#addItem(java.lang.Object)
+     * @see com.vaadin.data.Container#addItem(java.lang.Object)
      */
     public Item addItem(Object itemId) throws UnsupportedOperationException {
 
@@ -808,7 +808,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * returns false.
      * 
      * @return True if the operation succeeded.
-     * @see com.itmill.toolkit.data.Container#removeItem(java.lang.Object)
+     * @see com.vaadin.data.Container#removeItem(java.lang.Object)
      */
     public boolean removeItem(Object itemId)
             throws UnsupportedOperationException {
@@ -830,7 +830,7 @@ public abstract class AbstractSelect extends AbstractField implements
      * returns false.
      * 
      * @return True if the operation succeeded.
-     * @see com.itmill.toolkit.data.Container#removeContainerProperty(java.lang.Object)
+     * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object)
      */
     public boolean removeContainerProperty(Object propertyId)
             throws UnsupportedOperationException {
@@ -895,7 +895,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Gets the viewing data-source container.
      * 
-     * @see com.itmill.toolkit.data.Container.Viewer#getContainerDataSource()
+     * @see com.vaadin.data.Container.Viewer#getContainerDataSource()
      */
     public Container getContainerDataSource() {
         return items;
@@ -1360,7 +1360,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Notifies this listener that the Containers contents has changed.
      * 
-     * @see com.itmill.toolkit.data.Container.PropertySetChangeListener#containerPropertySetChange(com.itmill.toolkit.data.Container.PropertySetChangeEvent)
+     * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent)
      */
     public void containerPropertySetChange(
             Container.PropertySetChangeEvent event) {
@@ -1370,7 +1370,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Adds a new Property set change listener for this Container.
      * 
-     * @see com.itmill.toolkit.data.Container.PropertySetChangeNotifier#addListener(com.itmill.toolkit.data.Container.PropertySetChangeListener)
+     * @see com.vaadin.data.Container.PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener)
      */
     public void addListener(Container.PropertySetChangeListener listener) {
         if (propertySetEventListeners == null) {
@@ -1382,7 +1382,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Removes a previously registered Property set change listener.
      * 
-     * @see com.itmill.toolkit.data.Container.PropertySetChangeNotifier#removeListener(com.itmill.toolkit.data.Container.PropertySetChangeListener)
+     * @see com.vaadin.data.Container.PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.PropertySetChangeListener)
      */
     public void removeListener(Container.PropertySetChangeListener listener) {
         if (propertySetEventListeners != null) {
@@ -1396,7 +1396,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Adds an Item set change listener for the object.
      * 
-     * @see com.itmill.toolkit.data.Container.ItemSetChangeNotifier#addListener(com.itmill.toolkit.data.Container.ItemSetChangeListener)
+     * @see com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
     public void addListener(Container.ItemSetChangeListener listener) {
         if (itemSetEventListeners == null) {
@@ -1408,7 +1408,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Removes the Item set change listener from the object.
      * 
-     * @see com.itmill.toolkit.data.Container.ItemSetChangeNotifier#removeListener(com.itmill.toolkit.data.Container.ItemSetChangeListener)
+     * @see com.vaadin.data.Container.ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
     public void removeListener(Container.ItemSetChangeListener listener) {
         if (itemSetEventListeners != null) {
@@ -1422,7 +1422,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Lets the listener know a Containers Item set has changed.
      * 
-     * @see com.itmill.toolkit.data.Container.ItemSetChangeListener#containerItemSetChange(com.itmill.toolkit.data.Container.ItemSetChangeEvent)
+     * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent)
      */
     public void containerItemSetChange(Container.ItemSetChangeEvent event) {
         // Clears the item id mapping table
@@ -1472,7 +1472,7 @@ public abstract class AbstractSelect extends AbstractField implements
         /**
          * Gets the Property where the event occurred.
          * 
-         * @see com.itmill.toolkit.data.Container.ItemSetChangeEvent#getContainer()
+         * @see com.vaadin.data.Container.ItemSetChangeEvent#getContainer()
          */
         public Container getContainer() {
             return AbstractSelect.this;
@@ -1489,7 +1489,7 @@ public abstract class AbstractSelect extends AbstractField implements
         /**
          * Retrieves the Container whose contents have been modified.
          * 
-         * @see com.itmill.toolkit.data.Container.PropertySetChangeEvent#getContainer()
+         * @see com.vaadin.data.Container.PropertySetChangeEvent#getContainer()
          */
         public Container getContainer() {
             return AbstractSelect.this;
@@ -1570,7 +1570,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Notifies the component that it is connected to an application.
      * 
-     * @see com.itmill.toolkit.ui.AbstractField#attach()
+     * @see com.vaadin.ui.AbstractField#attach()
      */
     @Override
     public void attach() {
@@ -1580,7 +1580,7 @@ public abstract class AbstractSelect extends AbstractField implements
     /**
      * Detaches the component from application.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#detach()
+     * @see com.vaadin.ui.AbstractComponent#detach()
      */
     @Override
     public void detach() {
@@ -1665,12 +1665,12 @@ public abstract class AbstractSelect extends AbstractField implements
         }
 
         public void valueChange(
-                com.itmill.toolkit.data.Property.ValueChangeEvent event) {
+                com.vaadin.data.Property.ValueChangeEvent event) {
             requestRepaint();
         }
 
         public void itemPropertySetChange(
-                com.itmill.toolkit.data.Item.PropertySetChangeEvent event) {
+                com.vaadin.data.Item.PropertySetChangeEvent event) {
             requestRepaint();
         }
 
diff --git a/src/com/itmill/toolkit/ui/Accordion.java b/src/com/vaadin/ui/Accordion.java
index c7aeb369e6..73b4c03743 100644
--- a/src/com/itmill/toolkit/ui/Accordion.java
+++ b/src/com/vaadin/ui/Accordion.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 @SuppressWarnings("serial")
 public class Accordion extends TabSheet {
diff --git a/src/com/itmill/toolkit/ui/Alignment.java b/src/com/vaadin/ui/Alignment.java
index 91afc090fe..12d4c00110 100644
--- a/src/com/itmill/toolkit/ui/Alignment.java
+++ b/src/com/vaadin/ui/Alignment.java
@@ -1,8 +1,8 @@
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.terminal.gwt.client.ui.AlignmentInfo.Bits;
+import com.vaadin.terminal.gwt.client.ui.AlignmentInfo.Bits;
 
 /**
  * Class containing information about alignment of a component. Use the
diff --git a/src/com/itmill/toolkit/ui/AlignmentUtils.java b/src/com/vaadin/ui/AlignmentUtils.java
index f9962bef22..28076596df 100644
--- a/src/com/itmill/toolkit/ui/AlignmentUtils.java
+++ b/src/com/vaadin/ui/AlignmentUtils.java
@@ -1,10 +1,10 @@
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.itmill.toolkit.ui.Layout.AlignmentHandler;
+import com.vaadin.ui.Layout.AlignmentHandler;
 
 /**
  * Helper class for setting alignments using a short notation.
diff --git a/src/com/itmill/toolkit/ui/BaseFieldFactory.java b/src/com/vaadin/ui/BaseFieldFactory.java
index d5fd225322..66a153a287 100644
--- a/src/com/itmill/toolkit/ui/BaseFieldFactory.java
+++ b/src/com/vaadin/ui/BaseFieldFactory.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Date;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * Default implementation of the the following Field types are used by default:
@@ -37,7 +37,7 @@ public class BaseFieldFactory implements FieldFactory {
      * @param uiContext
      *            the context where the Field is presented.
      * 
-     * @see com.itmill.toolkit.ui.FieldFactory#createField(Class, Component)
+     * @see com.vaadin.ui.FieldFactory#createField(Class, Component)
      */
     public Field createField(Class type, Component uiContext) {
         // Null typed properties can not be edited
@@ -72,7 +72,7 @@ public class BaseFieldFactory implements FieldFactory {
     /**
      * Creates the field based on the datasource property.
      * 
-     * @see com.itmill.toolkit.ui.FieldFactory#createField(Property, Component)
+     * @see com.vaadin.ui.FieldFactory#createField(Property, Component)
      */
     public Field createField(Property property, Component uiContext) {
         if (property != null) {
@@ -85,7 +85,7 @@ public class BaseFieldFactory implements FieldFactory {
     /**
      * Creates the field based on the item and property id.
      * 
-     * @see com.itmill.toolkit.ui.FieldFactory#createField(Item, Object,
+     * @see com.vaadin.ui.FieldFactory#createField(Item, Object,
      *      Component)
      */
     public Field createField(Item item, Object propertyId, Component uiContext) {
@@ -139,8 +139,8 @@ public class BaseFieldFactory implements FieldFactory {
     }
 
     /**
-     * @see com.itmill.toolkit.ui.FieldFactory#createField(com.itmill.toolkit.data.Container,
-     *      java.lang.Object, java.lang.Object, com.itmill.toolkit.ui.Component)
+     * @see com.vaadin.ui.FieldFactory#createField(com.vaadin.data.Container,
+     *      java.lang.Object, java.lang.Object, com.vaadin.ui.Component)
      */
     public Field createField(Container container, Object itemId,
             Object propertyId, Component uiContext) {
diff --git a/src/com/itmill/toolkit/ui/Button.java b/src/com/vaadin/ui/Button.java
index 2af5ba49a3..872285f8fc 100644
--- a/src/com/itmill/toolkit/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -2,16 +2,16 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.data.Property;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * A generic button component.
@@ -68,7 +68,7 @@ public class Button extends AbstractField {
      * Creates a new push button with a method listening button clicks. Using
      * this method is discouraged because it cannot be checked during
      * compilation. Use
-     * {@link #Button(String, com.itmill.toolkit.ui.Button.ClickListener)}
+     * {@link #Button(String, com.vaadin.ui.Button.ClickListener)}
      * instead. The method must have either no parameters, or only one parameter
      * of Button.ClickEvent type.
      * 
@@ -225,7 +225,7 @@ public class Button extends AbstractField {
     /**
      * Sets immediate mode. Push buttons can not be set in non-immediate mode.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#setImmediate(boolean)
+     * @see com.vaadin.ui.AbstractComponent#setImmediate(boolean)
      */
     @Override
     public void setImmediate(boolean immediate) {
@@ -236,7 +236,7 @@ public class Button extends AbstractField {
     /**
      * The type of the button as a property.
      * 
-     * @see com.itmill.toolkit.data.Property#getType()
+     * @see com.vaadin.data.Property#getType()
      */
     @Override
     public Class getType() {
diff --git a/src/com/itmill/toolkit/ui/CheckBox.java b/src/com/vaadin/ui/CheckBox.java
index 731808a55e..32b47412a3 100644
--- a/src/com/itmill/toolkit/ui/CheckBox.java
+++ b/src/com/vaadin/ui/CheckBox.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.lang.reflect.Method;
 
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Property;
 
 @SuppressWarnings("serial")
 public class CheckBox extends Button {
@@ -47,7 +47,7 @@ public class CheckBox extends Button {
      * listening button clicks. Using this method is discouraged because it
      * cannot be checked during compilation. Use
      * {@link #addListener(Class, Object, Method)} or
-     * {@link #addListener(com.itmill.toolkit.ui.Component.Listener)} instead.
+     * {@link #addListener(com.vaadin.ui.Component.Listener)} instead.
      * The method must have either no parameters, or only one parameter of
      * Button.ClickEvent type.
      * 
diff --git a/src/com/itmill/toolkit/ui/ComboBox.java b/src/com/vaadin/ui/ComboBox.java
index a901d00540..68400986da 100644
--- a/src/com/itmill/toolkit/ui/ComboBox.java
+++ b/src/com/vaadin/ui/ComboBox.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Collection;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.data.Container;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * A filtering dropdown single-select. Suitable for newItemsAllowed, but it's
diff --git a/src/com/itmill/toolkit/ui/Component.java b/src/com/vaadin/ui/Component.java
index 9fbc6231cc..6b5ead80d2 100644
--- a/src/com/itmill/toolkit/ui/Component.java
+++ b/src/com/vaadin/ui/Component.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -10,12 +10,12 @@ import java.util.EventListener;
 import java.util.EventObject;
 import java.util.Locale;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.Paintable;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.terminal.VariableOwner;
+import com.vaadin.Application;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.Paintable;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.terminal.VariableOwner;
 
 /**
  * The top-level component interface which must be implemented by all UI
@@ -39,7 +39,7 @@ public interface Component extends Paintable, VariableOwner, Sizeable,
     /**
      * Sets and replaces all previous style names of the component. This method
      * will trigger a
-     * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent
+     * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent
      * RepaintRequestEvent}.
      * 
      * @param style
@@ -53,7 +53,7 @@ public interface Component extends Paintable, VariableOwner, Sizeable,
      * classes as given on server side.
      * 
      * This method will trigger a
-     * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent
+     * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent
      * RepaintRequestEvent}.
      * 
      * @param style
@@ -95,7 +95,7 @@ public interface Component extends Paintable, VariableOwner, Sizeable,
     /**
      * Enables or disables the component. Being enabled means that the component
      * can be edited. This method will trigger a
-     * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent
+     * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent
      * RepaintRequestEvent}.
      * 
      * <p>
@@ -186,7 +186,7 @@ public interface Component extends Paintable, VariableOwner, Sizeable,
     /**
      * Sets the component's to read-only mode to the specified state. This
      * method will trigger a
-     * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent
+     * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent
      * RepaintRequestEvent}.
      * 
      * @param readOnly
@@ -206,7 +206,7 @@ public interface Component extends Paintable, VariableOwner, Sizeable,
     /**
      * Sets the component's caption <code>String</code>. Caption is the visible
      * name of the component. This method will trigger a
-     * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent
+     * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent
      * RepaintRequestEvent}.
      * 
      * @param caption
@@ -224,7 +224,7 @@ public interface Component extends Paintable, VariableOwner, Sizeable,
 
     /**
      * Sets the component's icon. This method will trigger a
-     * {@link com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent
+     * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent
      * RepaintRequestEvent}.
      * 
      * @param icon
diff --git a/src/com/itmill/toolkit/ui/ComponentContainer.java b/src/com/vaadin/ui/ComponentContainer.java
index b696c0730d..aa591c9742 100644
--- a/src/com/itmill/toolkit/ui/ComponentContainer.java
+++ b/src/com/vaadin/ui/ComponentContainer.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.util.Iterator;
diff --git a/src/com/itmill/toolkit/ui/CustomComponent.java b/src/com/vaadin/ui/CustomComponent.java
index 8313609475..19fb081047 100644
--- a/src/com/itmill/toolkit/ui/CustomComponent.java
+++ b/src/com/vaadin/ui/CustomComponent.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.util.Iterator;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * Custom component provides simple implementation of Component interface for
@@ -173,8 +173,8 @@ public class CustomComponent extends AbstractComponentContainer {
     /**
      * This method is not supported by CustomComponent.
      * 
-     * @see com.itmill.toolkit.ui.ComponentContainer#replaceComponent(com.itmill.toolkit.ui.Component,
-     *      com.itmill.toolkit.ui.Component)
+     * @see com.vaadin.ui.ComponentContainer#replaceComponent(com.vaadin.ui.Component,
+     *      com.vaadin.ui.Component)
      */
     public void replaceComponent(Component oldComponent, Component newComponent) {
         throw new UnsupportedOperationException();
@@ -185,7 +185,7 @@ public class CustomComponent extends AbstractComponentContainer {
      * {@link CustomComponent#setCompositionRoot(Component)} to set
      * CustomComponents "child".
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#addComponent(com.itmill.toolkit.ui.Component)
+     * @see com.vaadin.ui.AbstractComponentContainer#addComponent(com.vaadin.ui.Component)
      */
     @Override
     public void addComponent(Component c) {
@@ -195,7 +195,7 @@ public class CustomComponent extends AbstractComponentContainer {
     /**
      * This method is not supported by CustomComponent.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#moveComponentsFrom(com.itmill.toolkit.ui.ComponentContainer)
+     * @see com.vaadin.ui.AbstractComponentContainer#moveComponentsFrom(com.vaadin.ui.ComponentContainer)
      */
     @Override
     public void moveComponentsFrom(ComponentContainer source) {
@@ -205,7 +205,7 @@ public class CustomComponent extends AbstractComponentContainer {
     /**
      * This method is not supported by CustomComponent.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#removeAllComponents()
+     * @see com.vaadin.ui.AbstractComponentContainer#removeAllComponents()
      */
     @Override
     public void removeAllComponents() {
@@ -215,7 +215,7 @@ public class CustomComponent extends AbstractComponentContainer {
     /**
      * This method is not supported by CustomComponent.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#removeComponent(com.itmill.toolkit.ui.Component)
+     * @see com.vaadin.ui.AbstractComponentContainer#removeComponent(com.vaadin.ui.Component)
      */
     @Override
     public void removeComponent(Component c) {
diff --git a/src/com/itmill/toolkit/ui/CustomLayout.java b/src/com/vaadin/ui/CustomLayout.java
index 5fdfe24770..6ec7986a29 100644
--- a/src/com/itmill/toolkit/ui/CustomLayout.java
+++ b/src/com/vaadin/ui/CustomLayout.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,8 +10,8 @@ import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * <p>
diff --git a/src/com/itmill/toolkit/ui/DateField.java b/src/com/vaadin/ui/DateField.java
index 6f76de48c5..fc88187c06 100644
--- a/src/com/itmill/toolkit/ui/DateField.java
+++ b/src/com/vaadin/ui/DateField.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -11,9 +11,9 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.data.Property;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * <p>
@@ -22,9 +22,9 @@ import com.itmill.toolkit.terminal.PaintTarget;
  * </p>
  * <p>
  * Since <code>DateField</code> extends <code>AbstractField</code> it implements
- * the {@link com.itmill.toolkit.data.Buffered}interface. A
+ * the {@link com.vaadin.data.Buffered}interface. A
  * <code>DateField</code> is in write-through mode by default, so
- * {@link com.itmill.toolkit.ui.AbstractField#setWriteThrough(boolean)}must be
+ * {@link com.vaadin.ui.AbstractField#setWriteThrough(boolean)}must be
  * called to enable buffering.
  * </p>
  * 
@@ -167,7 +167,7 @@ public class DateField extends AbstractField {
      * Constructs a new <code>DateField</code> with the given caption and
      * initial text contents. The editor constructed this way will not be bound
      * to a Property unless
-     * {@link com.itmill.toolkit.data.Property.Viewer#setPropertyDataSource(Property)}
+     * {@link com.vaadin.data.Property.Viewer#setPropertyDataSource(Property)}
      * is called to bind it.
      * 
      * @param caption
@@ -434,7 +434,7 @@ public class DateField extends AbstractField {
     /**
      * Sets the DateField datasource. Datasource type must assignable to Date.
      * 
-     * @see com.itmill.toolkit.data.Property.Viewer#setPropertyDataSource(Property)
+     * @see com.vaadin.data.Property.Viewer#setPropertyDataSource(Property)
      */
     @Override
     public void setPropertyDataSource(Property newDataSource) {
@@ -508,7 +508,7 @@ public class DateField extends AbstractField {
      * @param dateFormat
      *            the dateFormat to set
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#setLocale(Locale))
+     * @see com.vaadin.ui.AbstractComponent#setLocale(Locale))
      */
     public void setDateFormat(String dateFormat) {
         this.dateFormat = dateFormat;
diff --git a/src/com/itmill/toolkit/ui/Embedded.java b/src/com/vaadin/ui/Embedded.java
index 6b1e2af445..3b0acfee5e 100644
--- a/src/com/itmill/toolkit/ui/Embedded.java
+++ b/src/com/vaadin/ui/Embedded.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Hashtable;
 import java.util.Iterator;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Resource;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Resource;
 
 /**
  * Component for embedding external objects.
diff --git a/src/com/itmill/toolkit/ui/ExpandLayout.java b/src/com/vaadin/ui/ExpandLayout.java
index ea6f037daa..7f988a47c2 100644
--- a/src/com/itmill/toolkit/ui/ExpandLayout.java
+++ b/src/com/vaadin/ui/ExpandLayout.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 /**
  * A layout that will give one of it's components as much space as possible,
diff --git a/src/com/itmill/toolkit/ui/Field.java b/src/com/vaadin/ui/Field.java
index 8fb339a35d..72dc3130c3 100644
--- a/src/com/itmill/toolkit/ui/Field.java
+++ b/src/com/vaadin/ui/Field.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
-import com.itmill.toolkit.data.BufferedValidatable;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.ui.Component.Focusable;
+import com.vaadin.data.BufferedValidatable;
+import com.vaadin.data.Property;
+import com.vaadin.ui.Component.Focusable;
 
 /**
  * @author IT Mill Ltd.
diff --git a/src/com/itmill/toolkit/ui/FieldFactory.java b/src/com/vaadin/ui/FieldFactory.java
index 6598577f48..f0f96386e3 100644
--- a/src/com/itmill/toolkit/ui/FieldFactory.java
+++ b/src/com/vaadin/ui/FieldFactory.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
 
 /**
  * Factory for creating new Field-instances based on type, datasource and/or
diff --git a/src/com/itmill/toolkit/ui/Form.java b/src/com/vaadin/ui/Form.java
index ee45ec0478..3922028af0 100644
--- a/src/com/itmill/toolkit/ui/Form.java
+++ b/src/com/vaadin/ui/Form.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -10,17 +10,17 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.itmill.toolkit.data.Buffered;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.Validatable;
-import com.itmill.toolkit.data.Validator;
-import com.itmill.toolkit.data.Validator.InvalidValueException;
-import com.itmill.toolkit.data.util.BeanItem;
-import com.itmill.toolkit.terminal.CompositeErrorMessage;
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.data.Buffered;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.Validatable;
+import com.vaadin.data.Validator;
+import com.vaadin.data.Validator.InvalidValueException;
+import com.vaadin.data.util.BeanItem;
+import com.vaadin.terminal.CompositeErrorMessage;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * Form component provides easy way of creating and managing sets fields.
@@ -36,16 +36,16 @@ import com.itmill.toolkit.terminal.PaintTarget;
  * 
  * <p>
  * <code>Form</code> provides customizable editor for classes implementing
- * {@link com.itmill.toolkit.data.Item} interface. Also the form itself
+ * {@link com.vaadin.data.Item} interface. Also the form itself
  * implements this interface for easier connectivity to other items. To use the
  * form as editor for an item, just connect the item to form with
  * {@link Form#setItemDataSource(Item)}. If only a part of the item needs to be
  * edited, {@link Form#setItemDataSource(Item,Collection)} can be used instead.
  * After the item has been connected to the form, the automatically created
  * fields can be customized and new fields can be added. If you need to connect
- * a class that does not implement {@link com.itmill.toolkit.data.Item}
+ * a class that does not implement {@link com.vaadin.data.Item}
  * interface, most properties of any class following bean pattern, can be
- * accessed trough {@link com.itmill.toolkit.data.util.BeanItem}.
+ * accessed trough {@link com.vaadin.data.util.BeanItem}.
  * </p>
  * 
  * @author IT Mill Ltd.
@@ -110,7 +110,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
      */
     private final ValueChangeListener fieldValueChangeListener = new ValueChangeListener() {
         public void valueChange(
-                com.itmill.toolkit.data.Property.ValueChangeEvent event) {
+                com.vaadin.data.Property.ValueChangeEvent event) {
             requestRepaint();
         }
     };
@@ -437,7 +437,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Adds a new property to form and create corresponding field.
      * 
-     * @see com.itmill.toolkit.data.Item#addItemProperty(Object, Property)
+     * @see com.vaadin.data.Item#addItemProperty(Object, Property)
      */
     public boolean addItemProperty(Object id, Property property) {
 
@@ -529,7 +529,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
      * source, the field is returned instead of the data source.
      * </p>
      * 
-     * @see com.itmill.toolkit.data.Item#getItemProperty(Object)
+     * @see com.vaadin.data.Item#getItemProperty(Object)
      */
     public Property getItemProperty(Object id) {
         final Field field = (Field) fields.get(id);
@@ -563,7 +563,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Removes the property and corresponding field from the form.
      * 
-     * @see com.itmill.toolkit.data.Item#removeItemProperty(Object)
+     * @see com.vaadin.data.Item#removeItemProperty(Object)
      */
     public boolean removeItemProperty(Object id) {
 
@@ -612,7 +612,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
      * adds all the properties as fields to the form.
      * </p>
      * 
-     * @see com.itmill.toolkit.data.Item.Viewer#setItemDataSource(Item)
+     * @see com.vaadin.data.Item.Viewer#setItemDataSource(Item)
      */
     public void setItemDataSource(Item newDataSource) {
         setItemDataSource(newDataSource, newDataSource != null ? newDataSource
@@ -629,7 +629,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
      * order.
      * </p>
      * 
-     * @see com.itmill.toolkit.data.Item.Viewer#setItemDataSource(Item)
+     * @see com.vaadin.data.Item.Viewer#setItemDataSource(Item)
      */
     public void setItemDataSource(Item newDataSource, Collection propertyIds) {
 
@@ -849,7 +849,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Notifies the component that it is connected to an application
      * 
-     * @see com.itmill.toolkit.ui.Component#attach()
+     * @see com.vaadin.ui.Component#attach()
      */
     @Override
     public void attach() {
@@ -860,7 +860,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Notifies the component that it is detached from the application.
      * 
-     * @see com.itmill.toolkit.ui.Component#detach()
+     * @see com.vaadin.ui.Component#detach()
      */
     @Override
     public void detach() {
@@ -871,7 +871,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Tests the current value of the object against all registered validators
      * 
-     * @see com.itmill.toolkit.data.Validatable#isValid()
+     * @see com.vaadin.data.Validatable#isValid()
      */
     @Override
     public boolean isValid() {
@@ -885,7 +885,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Checks the validity of the validatable.
      * 
-     * @see com.itmill.toolkit.data.Validatable#validate()
+     * @see com.vaadin.data.Validatable#validate()
      */
     @Override
     public void validate() throws InvalidValueException {
@@ -898,7 +898,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Checks the validabtable object accept invalid values.
      * 
-     * @see com.itmill.toolkit.data.Validatable#isInvalidAllowed()
+     * @see com.vaadin.data.Validatable#isInvalidAllowed()
      */
     @Override
     public boolean isInvalidAllowed() {
@@ -908,7 +908,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Should the validabtable object accept invalid values.
      * 
-     * @see com.itmill.toolkit.data.Validatable#setInvalidAllowed(boolean)
+     * @see com.vaadin.data.Validatable#setInvalidAllowed(boolean)
      */
     @Override
     public void setInvalidAllowed(boolean invalidValueAllowed)
@@ -919,7 +919,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Sets the component's to read-only mode to the specified state.
      * 
-     * @see com.itmill.toolkit.ui.Component#setReadOnly(boolean)
+     * @see com.vaadin.ui.Component#setReadOnly(boolean)
      */
     @Override
     public void setReadOnly(boolean readOnly) {
@@ -956,7 +956,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Gets the field type.
      * 
-     * @see com.itmill.toolkit.ui.AbstractField#getType()
+     * @see com.vaadin.ui.AbstractField#getType()
      */
     @Override
     public Class getType() {
@@ -971,7 +971,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
      * 
      * This is relevant when the Form is used as Field.
      * 
-     * @see com.itmill.toolkit.ui.AbstractField#setInternalValue(java.lang.Object)
+     * @see com.vaadin.ui.AbstractField#setInternalValue(java.lang.Object)
      */
     @Override
     protected void setInternalValue(Object newValue) {
@@ -1073,7 +1073,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Focuses the first field in the form.
      * 
-     * @see com.itmill.toolkit.ui.Component.Focusable#focus()
+     * @see com.vaadin.ui.Component.Focusable#focus()
      */
     @Override
     public void focus() {
@@ -1086,7 +1086,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
     /**
      * Sets the Tabulator index of this Focusable component.
      * 
-     * @see com.itmill.toolkit.ui.Component.Focusable#setTabIndex(int)
+     * @see com.vaadin.ui.Component.Focusable#setTabIndex(int)
      */
     @Override
     public void setTabIndex(int tabIndex) {
diff --git a/src/com/itmill/toolkit/ui/FormLayout.java b/src/com/vaadin/ui/FormLayout.java
index 54074f05f9..1fbfcf2ee4 100644
--- a/src/com/itmill/toolkit/ui/FormLayout.java
+++ b/src/com/vaadin/ui/FormLayout.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 /**
  * FormLayout is used by {@link Form} to layout fields. It may also be used
diff --git a/src/com/itmill/toolkit/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java
index 888b5f840b..fbbc0e3ffa 100644
--- a/src/com/itmill/toolkit/ui/GridLayout.java
+++ b/src/com/vaadin/ui/GridLayout.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -12,8 +12,8 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * <p>
@@ -625,7 +625,7 @@ public class GridLayout extends AbstractLayout implements
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.ui.Layout.AlignmentHandler#getComponentAlignment(com
+     * com.vaadin.ui.Layout.AlignmentHandler#getComponentAlignment(com
      * .itmill.toolkit.ui.Component)
      */
     public Alignment getComponentAlignment(Component childComponent) {
@@ -641,7 +641,7 @@ public class GridLayout extends AbstractLayout implements
      * Gets the components UIDL tag.
      * 
      * @return the Component UIDL tag as string.
-     * @see com.itmill.toolkit.ui.AbstractComponent#getTag()
+     * @see com.vaadin.ui.AbstractComponent#getTag()
      */
     @Override
     public String getTag() {
@@ -759,7 +759,7 @@ public class GridLayout extends AbstractLayout implements
         /**
          * @deprecated Use getColumn1() instead.
          * 
-         * @see com.itmill.toolkit.ui.GridLayout#getColumn1()
+         * @see com.vaadin.ui.GridLayout#getColumn1()
          */
         @Deprecated
         public int getX1() {
@@ -778,7 +778,7 @@ public class GridLayout extends AbstractLayout implements
         /**
          * @deprecated Use getColumn2() instead.
          * 
-         * @see com.itmill.toolkit.ui.GridLayout#getColumn2()
+         * @see com.vaadin.ui.GridLayout#getColumn2()
          */
         @Deprecated
         public int getX2() {
@@ -797,7 +797,7 @@ public class GridLayout extends AbstractLayout implements
         /**
          * @deprecated Use getRow1() instead.
          * 
-         * @see com.itmill.toolkit.ui.GridLayout#getRow1()
+         * @see com.vaadin.ui.GridLayout#getRow1()
          */
         @Deprecated
         public int getY1() {
@@ -816,7 +816,7 @@ public class GridLayout extends AbstractLayout implements
         /**
          * @deprecated Use getRow2() instead.
          * 
-         * @see com.itmill.toolkit.ui.GridLayout#getRow2()
+         * @see com.vaadin.ui.GridLayout#getRow2()
          */
         @Deprecated
         public int getY2() {
@@ -1064,7 +1064,7 @@ public class GridLayout extends AbstractLayout implements
     /*
      * Removes all components from this container.
      * 
-     * @see com.itmill.toolkit.ui.ComponentContainer#removeAllComponents()
+     * @see com.vaadin.ui.ComponentContainer#removeAllComponents()
      */
     @Override
     public void removeAllComponents() {
@@ -1078,7 +1078,7 @@ public class GridLayout extends AbstractLayout implements
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.ui.Layout.AlignmentHandler#setComponentAlignment(com
+     * com.vaadin.ui.Layout.AlignmentHandler#setComponentAlignment(com
      * .itmill.toolkit.ui.Component, int, int)
      */
     public void setComponentAlignment(Component childComponent,
@@ -1097,7 +1097,7 @@ public class GridLayout extends AbstractLayout implements
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Layout.SpacingHandler#setSpacing(boolean)
+     * @see com.vaadin.ui.Layout.SpacingHandler#setSpacing(boolean)
      */
     public void setSpacing(boolean enabled) {
         spacing = enabled;
@@ -1107,7 +1107,7 @@ public class GridLayout extends AbstractLayout implements
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Layout.SpacingHandler#isSpacing()
+     * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing()
      */
     @Deprecated
     public boolean isSpacingEnabled() {
@@ -1117,7 +1117,7 @@ public class GridLayout extends AbstractLayout implements
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Layout.SpacingHandler#isSpacing()
+     * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing()
      */
     public boolean isSpacing() {
         return spacing;
diff --git a/src/com/itmill/toolkit/ui/HorizontalLayout.java b/src/com/vaadin/ui/HorizontalLayout.java
index f648ba157a..820b0c29de 100644
--- a/src/com/itmill/toolkit/ui/HorizontalLayout.java
+++ b/src/com/vaadin/ui/HorizontalLayout.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 /**
  * Horizontal layout
diff --git a/src/com/itmill/toolkit/ui/InlineDateField.java b/src/com/vaadin/ui/InlineDateField.java
index d24f1ecba5..88f0c3e0b4 100644
--- a/src/com/itmill/toolkit/ui/InlineDateField.java
+++ b/src/com/vaadin/ui/InlineDateField.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Date;
 
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Property;
 
 /**
  * <p>
diff --git a/src/com/itmill/toolkit/ui/Label.java b/src/com/vaadin/ui/Label.java
index 26d4d16963..3b24a07930 100644
--- a/src/com/itmill/toolkit/ui/Label.java
+++ b/src/com/vaadin/ui/Label.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.lang.reflect.Method;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * Label component for showing non-editable short texts.
@@ -265,7 +265,7 @@ public class Label extends AbstractComponent implements Property,
     /**
      * Gets the type of the Property.
      * 
-     * @see com.itmill.toolkit.data.Property#getType()
+     * @see com.vaadin.data.Property#getType()
      */
     public Class getType() {
         if (dataSource == null) {
@@ -278,7 +278,7 @@ public class Label extends AbstractComponent implements Property,
      * Gets the viewing data-source property.
      * 
      * @return the data source property.
-     * @see com.itmill.toolkit.data.Property.Viewer#getPropertyDataSource()
+     * @see com.vaadin.data.Property.Viewer#getPropertyDataSource()
      */
     public Property getPropertyDataSource() {
         return dataSource;
@@ -289,7 +289,7 @@ public class Label extends AbstractComponent implements Property,
      * 
      * @param newDataSource
      *            the new data source Property
-     * @see com.itmill.toolkit.data.Property.Viewer#setPropertyDataSource(com.itmill.toolkit.data.Property)
+     * @see com.vaadin.data.Property.Viewer#setPropertyDataSource(com.vaadin.data.Property)
      */
     public void setPropertyDataSource(Property newDataSource) {
         // Stops listening the old data source changes
@@ -419,7 +419,7 @@ public class Label extends AbstractComponent implements Property,
         /**
          * Gets the Property that has been modified.
          * 
-         * @see com.itmill.toolkit.data.Property.ValueChangeEvent#getProperty()
+         * @see com.vaadin.data.Property.ValueChangeEvent#getProperty()
          */
         public Property getProperty() {
             return (Property) getSource();
@@ -431,7 +431,7 @@ public class Label extends AbstractComponent implements Property,
      * 
      * @param listener
      *            the Listener to be added.
-     * @see com.itmill.toolkit.data.Property.ValueChangeNotifier#addListener(com.itmill.toolkit.data.Property.ValueChangeListener)
+     * @see com.vaadin.data.Property.ValueChangeNotifier#addListener(com.vaadin.data.Property.ValueChangeListener)
      */
     public void addListener(Property.ValueChangeListener listener) {
         addListener(Label.ValueChangeEvent.class, listener, VALUE_CHANGE_METHOD);
@@ -442,7 +442,7 @@ public class Label extends AbstractComponent implements Property,
      * 
      * @param listener
      *            the Listener to be removed.
-     * @see com.itmill.toolkit.data.Property.ValueChangeNotifier#removeListener(com.itmill.toolkit.data.Property.ValueChangeListener)
+     * @see com.vaadin.data.Property.ValueChangeNotifier#removeListener(com.vaadin.data.Property.ValueChangeListener)
      */
     public void removeListener(Property.ValueChangeListener listener) {
         removeListener(Label.ValueChangeEvent.class, listener,
@@ -461,7 +461,7 @@ public class Label extends AbstractComponent implements Property,
     /**
      * Listens the value change events from data source.
      * 
-     * @see com.itmill.toolkit.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
+     * @see com.vaadin.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
      */
     public void valueChange(Property.ValueChangeEvent event) {
         fireValueChange();
diff --git a/src/com/itmill/toolkit/ui/Layout.java b/src/com/vaadin/ui/Layout.java
index f35bbf7ff9..935ae363b5 100644
--- a/src/com/itmill/toolkit/ui/Layout.java
+++ b/src/com/vaadin/ui/Layout.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 
-import com.itmill.toolkit.terminal.gwt.client.ui.IMarginInfo;
-import com.itmill.toolkit.terminal.gwt.client.ui.AlignmentInfo.Bits;
+import com.vaadin.terminal.gwt.client.ui.IMarginInfo;
+import com.vaadin.terminal.gwt.client.ui.AlignmentInfo.Bits;
 
 /**
  * Extension to the {@link ComponentContainer} interface which adds the
diff --git a/src/com/itmill/toolkit/ui/Link.java b/src/com/vaadin/ui/Link.java
index 53f2837386..6deb05a99a 100644
--- a/src/com/itmill/toolkit/ui/Link.java
+++ b/src/com/vaadin/ui/Link.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Resource;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Resource;
 
 /**
  * Link is used to create external or internal URL links.
diff --git a/src/com/itmill/toolkit/ui/ListSelect.java b/src/com/vaadin/ui/ListSelect.java
index 9d3fe70fdb..7860474433 100644
--- a/src/com/itmill/toolkit/ui/ListSelect.java
+++ b/src/com/vaadin/ui/ListSelect.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Collection;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.data.Container;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * This is a simple list select without, for instance, support for new items,
diff --git a/src/com/itmill/toolkit/ui/LoginForm.java b/src/com/vaadin/ui/LoginForm.java
index eef64d598e..3d3aeaf8b7 100644
--- a/src/com/itmill/toolkit/ui/LoginForm.java
+++ b/src/com/vaadin/ui/LoginForm.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.ByteArrayInputStream;
 import java.io.Serializable;
@@ -8,11 +8,11 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.ApplicationResource;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.URIHandler;
+import com.vaadin.Application;
+import com.vaadin.terminal.ApplicationResource;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.terminal.URIHandler;
 
 /**
  * LoginForm is a Toolkit component to handle common problem among Ajax
diff --git a/src/com/itmill/toolkit/ui/MenuBar.java b/src/com/vaadin/ui/MenuBar.java
index e3004eb196..0ce6e725d9 100644
--- a/src/com/itmill/toolkit/ui/MenuBar.java
+++ b/src/com/vaadin/ui/MenuBar.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -7,9 +7,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Resource;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Resource;
 
 /**
  * <p>
@@ -340,9 +340,9 @@ public class MenuBar extends AbstractComponent {
 
     /**
      * This interface contains the layer for menu commands of the
-     * {@link com.itmill.toolkit.ui.MenuBar} class. It's method will fire when
+     * {@link com.vaadin.ui.MenuBar} class. It's method will fire when
      * the user clicks on the containing
-     * {@link com.itmill.toolkit.ui.MenuBar.MenuItem}. The selected item is
+     * {@link com.vaadin.ui.MenuBar.MenuItem}. The selected item is
      * given as an argument.
      */
     public interface Command extends Serializable {
@@ -352,7 +352,7 @@ public class MenuBar extends AbstractComponent {
     /**
      * A composite class for menu items and sub-menus. You can set commands to
      * be fired on user click by implementing the
-     * {@link com.itmill.toolkit.ui.MenuBar.Command} interface. You can also add
+     * {@link com.vaadin.ui.MenuBar.Command} interface. You can also add
      * multiple MenuItems to a MenuItem and create a sub-menu.
      * 
      */
@@ -498,7 +498,7 @@ public class MenuBar extends AbstractComponent {
          * For the containing item. This will return null if the item is in the
          * top-level menu bar.
          * 
-         * @return The containing {@link com.itmill.toolkit.ui.MenuBar.MenuItem}
+         * @return The containing {@link com.vaadin.ui.MenuBar.MenuItem}
          *         , or null if there is none
          */
         public MenuBar.MenuItem getParent() {
diff --git a/src/com/itmill/toolkit/ui/NativeSelect.java b/src/com/vaadin/ui/NativeSelect.java
index 33a88c4ceb..e178a39397 100644
--- a/src/com/itmill/toolkit/ui/NativeSelect.java
+++ b/src/com/vaadin/ui/NativeSelect.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Collection;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.data.Container;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * This is a simple drop-down select without, for instance, support for
diff --git a/src/com/itmill/toolkit/ui/OptionGroup.java b/src/com/vaadin/ui/OptionGroup.java
index 25664b2a7a..861b57f5c6 100644
--- a/src/com/itmill/toolkit/ui/OptionGroup.java
+++ b/src/com/vaadin/ui/OptionGroup.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Collection;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.data.Container;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * Configures select to be used as an option group.
diff --git a/src/com/itmill/toolkit/ui/OrderedLayout.java b/src/com/vaadin/ui/OrderedLayout.java
index 61c59b31aa..572d621919 100644
--- a/src/com/itmill/toolkit/ui/OrderedLayout.java
+++ b/src/com/vaadin/ui/OrderedLayout.java
@@ -1,7 +1,7 @@
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * Ordered layout.
diff --git a/src/com/itmill/toolkit/ui/Panel.java b/src/com/vaadin/ui/Panel.java
index 8089bbdc18..e50713846c 100644
--- a/src/com/itmill/toolkit/ui/Panel.java
+++ b/src/com/vaadin/ui/Panel.java
@@ -2,19 +2,19 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
 
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.event.ShortcutAction;
-import com.itmill.toolkit.event.Action.Handler;
-import com.itmill.toolkit.terminal.KeyMapper;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Scrollable;
+import com.vaadin.event.Action;
+import com.vaadin.event.ShortcutAction;
+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.Scrollable;
 
 /**
  * Panel - a simple single component container.
@@ -289,7 +289,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * 
      * @param c
      *            the component to be added.
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#addComponent(com.itmill.toolkit.ui.Component)
+     * @see com.vaadin.ui.AbstractComponentContainer#addComponent(com.vaadin.ui.Component)
      */
     @Override
     public void addComponent(Component c) {
@@ -303,7 +303,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * 
      * @param c
      *            The component to be added.
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#removeComponent(com.itmill.toolkit.ui.Component)
+     * @see com.vaadin.ui.AbstractComponentContainer#removeComponent(com.vaadin.ui.Component)
      */
     @Override
     public void removeComponent(Component c) {
@@ -317,7 +317,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * in the container.
      * 
      * @return the Iterator of the components inside the container.
-     * @see com.itmill.toolkit.ui.ComponentContainer#getComponentIterator()
+     * @see com.vaadin.ui.ComponentContainer#getComponentIterator()
      */
     public Iterator getComponentIterator() {
         return content.getComponentIterator();
@@ -327,7 +327,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * Called when one or more variables handled by the implementing class are
      * changed.
      * 
-     * @see com.itmill.toolkit.terminal.VariableOwner#changeVariables(Object,
+     * @see com.vaadin.terminal.VariableOwner#changeVariables(Object,
      *      Map)
      */
     @Override
@@ -461,7 +461,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /**
      * A new component is attached to container.
      * 
-     * @see com.itmill.toolkit.ui.ComponentContainer.ComponentAttachListener#componentAttachedToContainer(com.itmill.toolkit.ui.ComponentContainer.ComponentAttachEvent)
+     * @see com.vaadin.ui.ComponentContainer.ComponentAttachListener#componentAttachedToContainer(com.vaadin.ui.ComponentContainer.ComponentAttachEvent)
      */
     public void componentAttachedToContainer(ComponentAttachEvent event) {
         if (event.getContainer() == content) {
@@ -472,7 +472,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /**
      * A component has been detached from container.
      * 
-     * @see com.itmill.toolkit.ui.ComponentContainer.ComponentDetachListener#componentDetachedFromContainer(com.itmill.toolkit.ui.ComponentContainer.ComponentDetachEvent)
+     * @see com.vaadin.ui.ComponentContainer.ComponentDetachListener#componentDetachedFromContainer(com.vaadin.ui.ComponentContainer.ComponentDetachEvent)
      */
     public void componentDetachedFromContainer(ComponentDetachEvent event) {
         if (event.getContainer() == content) {
@@ -483,7 +483,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /**
      * Notifies the component that it is connected to an application.
      * 
-     * @see com.itmill.toolkit.ui.Component#attach()
+     * @see com.vaadin.ui.Component#attach()
      */
     @Override
     public void attach() {
@@ -497,7 +497,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /**
      * Notifies the component that it is detached from the application.
      * 
-     * @see com.itmill.toolkit.ui.Component#detach()
+     * @see com.vaadin.ui.Component#detach()
      */
     @Override
     public void detach() {
@@ -510,7 +510,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /**
      * Removes all components from this container.
      * 
-     * @see com.itmill.toolkit.ui.ComponentContainer#removeAllComponents()
+     * @see com.vaadin.ui.ComponentContainer#removeAllComponents()
      */
     @Override
     public void removeAllComponents() {
@@ -536,7 +536,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /**
      * Removes an action handler.
      * 
-     * @see com.itmill.toolkit.event.Action.Container#removeActionHandler(Action.Handler)
+     * @see com.vaadin.event.Action.Container#removeActionHandler(Action.Handler)
      */
     public void removeActionHandler(Action.Handler actionHandler) {
 
diff --git a/src/com/itmill/toolkit/ui/PopupDateField.java b/src/com/vaadin/ui/PopupDateField.java
index 873b991cd3..5164601f0d 100644
--- a/src/com/itmill/toolkit/ui/PopupDateField.java
+++ b/src/com/vaadin/ui/PopupDateField.java
@@ -2,11 +2,11 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Date;
 
-import com.itmill.toolkit.data.Property;
+import com.vaadin.data.Property;
 
 /**
  * <p>
diff --git a/src/com/itmill/toolkit/ui/PopupView.java b/src/com/vaadin/ui/PopupView.java
index a9b9cb13be..4fa89a7eb5 100644
--- a/src/com/itmill/toolkit/ui/PopupView.java
+++ b/src/com/vaadin/ui/PopupView.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * 
@@ -185,7 +185,7 @@ public class PopupView extends AbstractComponentContainer {
     /**
      * This class only contains other components when the popup is showing.
      * 
-     * @see com.itmill.toolkit.ui.ComponentContainer#getComponentIterator()
+     * @see com.vaadin.ui.ComponentContainer#getComponentIterator()
      */
     public Iterator<Component> getComponentIterator() {
         return new Iterator<Component>() {
@@ -215,7 +215,7 @@ public class PopupView extends AbstractComponentContainer {
     /**
      * Not supported in this implementation.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#removeAllComponents()
+     * @see com.vaadin.ui.AbstractComponentContainer#removeAllComponents()
      * @throws UnsupportedOperationException
      */
     @Override
@@ -226,7 +226,7 @@ public class PopupView extends AbstractComponentContainer {
     /**
      * Not supported in this implementation.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#moveComponentsFrom(com.itmill.toolkit.ui.ComponentContainer)
+     * @see com.vaadin.ui.AbstractComponentContainer#moveComponentsFrom(com.vaadin.ui.ComponentContainer)
      * @throws UnsupportedOperationException
      */
     @Override
@@ -239,7 +239,7 @@ public class PopupView extends AbstractComponentContainer {
     /**
      * Not supported in this implementation.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#addComponent(com.itmill.toolkit.ui.Component)
+     * @see com.vaadin.ui.AbstractComponentContainer#addComponent(com.vaadin.ui.Component)
      * @throws UnsupportedOperationException
      */
     @Override
@@ -251,8 +251,8 @@ public class PopupView extends AbstractComponentContainer {
     /**
      * Not supported in this implementation.
      * 
-     * @see com.itmill.toolkit.ui.ComponentContainer#replaceComponent(com.itmill.toolkit.ui.Component,
-     *      com.itmill.toolkit.ui.Component)
+     * @see com.vaadin.ui.ComponentContainer#replaceComponent(com.vaadin.ui.Component,
+     *      com.vaadin.ui.Component)
      * @throws UnsupportedOperationException
      */
     public void replaceComponent(Component oldComponent, Component newComponent)
@@ -264,7 +264,7 @@ public class PopupView extends AbstractComponentContainer {
     /**
      * Not supported in this implementation
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponentContainer#removeComponent(com.itmill.toolkit.ui.Component)
+     * @see com.vaadin.ui.AbstractComponentContainer#removeComponent(com.vaadin.ui.Component)
      */
     @Override
     public void removeComponent(Component c)
@@ -278,7 +278,7 @@ public class PopupView extends AbstractComponentContainer {
      */
 
     /**
-     * @see com.itmill.toolkit.ui.AbstractComponent#getTag()
+     * @see com.vaadin.ui.AbstractComponent#getTag()
      */
     @Override
     public java.lang.String getTag() {
@@ -288,7 +288,7 @@ public class PopupView extends AbstractComponentContainer {
     /**
      * Paint (serialize) the component for the client.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#paintContent(com.itmill.toolkit.terminal.PaintTarget)
+     * @see com.vaadin.ui.AbstractComponent#paintContent(com.vaadin.terminal.PaintTarget)
      */
     @Override
     public void paintContent(PaintTarget target) throws PaintException {
@@ -316,7 +316,7 @@ public class PopupView extends AbstractComponentContainer {
     /**
      * Deserialize changes received from client.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#changeVariables(java.lang.Object,
+     * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
     @Override
diff --git a/src/com/itmill/toolkit/ui/ProgressIndicator.java b/src/com/vaadin/ui/ProgressIndicator.java
index 6f05db772d..1ad5848dfb 100644
--- a/src/com/itmill/toolkit/ui/ProgressIndicator.java
+++ b/src/com/vaadin/ui/ProgressIndicator.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.ObjectProperty;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * <code>ProgressIndicator</code> is component that shows user state of a
@@ -129,7 +129,7 @@ public class ProgressIndicator extends AbstractField implements Property,
      * is Float between 0 and 1.
      * 
      * @return the Value of the ProgressIndicator.
-     * @see com.itmill.toolkit.ui.AbstractField#getValue()
+     * @see com.vaadin.ui.AbstractField#getValue()
      */
     @Override
     public Object getValue() {
@@ -145,7 +145,7 @@ public class ProgressIndicator extends AbstractField implements Property,
      * 
      * @param newValue
      *            the New value of the ProgressIndicator.
-     * @see com.itmill.toolkit.ui.AbstractField#setValue(java.lang.Object)
+     * @see com.vaadin.ui.AbstractField#setValue(java.lang.Object)
      */
     @Override
     public void setValue(Object newValue) {
@@ -156,7 +156,7 @@ public class ProgressIndicator extends AbstractField implements Property,
     }
 
     /**
-     * @see com.itmill.toolkit.ui.AbstractField#toString()
+     * @see com.vaadin.ui.AbstractField#toString()
      */
     @Override
     public String toString() {
@@ -167,7 +167,7 @@ public class ProgressIndicator extends AbstractField implements Property,
     }
 
     /**
-     * @see com.itmill.toolkit.ui.AbstractField#getType()
+     * @see com.vaadin.ui.AbstractField#getType()
      */
     @Override
     public Class getType() {
@@ -181,7 +181,7 @@ public class ProgressIndicator extends AbstractField implements Property,
      * Gets the viewing data-source property.
      * 
      * @return the datasource.
-     * @see com.itmill.toolkit.ui.AbstractField#getPropertyDataSource()
+     * @see com.vaadin.ui.AbstractField#getPropertyDataSource()
      */
     @Override
     public Property getPropertyDataSource() {
@@ -193,7 +193,7 @@ public class ProgressIndicator extends AbstractField implements Property,
      * 
      * @param newDataSource
      *            the new data source.
-     * @see com.itmill.toolkit.ui.AbstractField#setPropertyDataSource(com.itmill.toolkit.data.Property)
+     * @see com.vaadin.ui.AbstractField#setPropertyDataSource(com.vaadin.data.Property)
      */
     @Override
     public void setPropertyDataSource(Property newDataSource) {
diff --git a/src/com/itmill/toolkit/ui/RichTextArea.java b/src/com/vaadin/ui/RichTextArea.java
index 4e2830329b..4c1c281811 100644
--- a/src/com/itmill/toolkit/ui/RichTextArea.java
+++ b/src/com/vaadin/ui/RichTextArea.java
@@ -2,10 +2,10 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * A simple RichTextArea to edit HTML format text.
diff --git a/src/com/itmill/toolkit/ui/Select.java b/src/com/vaadin/ui/Select.java
index a1acec5e3e..ce3fb7e687 100644
--- a/src/com/itmill/toolkit/ui/Select.java
+++ b/src/com/vaadin/ui/Select.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -12,16 +12,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Resource;
+import com.vaadin.data.Container;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Resource;
 
 /**
  * <p>
  * A class representing a selection of items the user has selected in a UI. The
- * set of choices is presented as a set of {@link com.itmill.toolkit.data.Item}s
- * in a {@link com.itmill.toolkit.data.Container}.
+ * set of choices is presented as a set of {@link com.vaadin.data.Item}s
+ * in a {@link com.vaadin.data.Container}.
  * </p>
  * 
  * <p>
@@ -325,7 +325,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering {
     /**
      * Invoked when the value of a variable has changed.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#changeVariables(java.lang.Object,
+     * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
     @Override
diff --git a/src/com/itmill/toolkit/ui/Slider.java b/src/com/vaadin/ui/Slider.java
index 06d2264810..ec9fc2c90b 100644
--- a/src/com/itmill/toolkit/ui/Slider.java
+++ b/src/com/vaadin/ui/Slider.java
@@ -2,12 +2,12 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * A component for selecting a numerical value within a range.
diff --git a/src/com/itmill/toolkit/ui/SplitPanel.java b/src/com/vaadin/ui/SplitPanel.java
index 06b8073c6c..bad238d888 100644
--- a/src/com/itmill/toolkit/ui/SplitPanel.java
+++ b/src/com/vaadin/ui/SplitPanel.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Iterator;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.gwt.client.RenderInformation.Size;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.gwt.client.RenderInformation.Size;
 
 /**
  * SplitPanel.
diff --git a/src/com/itmill/toolkit/ui/TabSheet.java b/src/com/vaadin/ui/TabSheet.java
index 510cf99d73..b0dac11767 100644
--- a/src/com/itmill/toolkit/ui/TabSheet.java
+++ b/src/com/vaadin/ui/TabSheet.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -11,12 +11,12 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.ErrorMessage;
-import com.itmill.toolkit.terminal.KeyMapper;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.Paintable.RepaintRequestListener;
+import com.vaadin.terminal.ErrorMessage;
+import com.vaadin.terminal.KeyMapper;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.Paintable.RepaintRequestListener;
 
 /**
  * Tabsheet component.
@@ -416,7 +416,7 @@ public class TabSheet extends AbstractComponentContainer implements
     /**
      * Invoked when the value of a variable has changed.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#changeVariables(java.lang.Object,
+     * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
     @Override
diff --git a/src/com/itmill/toolkit/ui/Table.java b/src/com/vaadin/ui/Table.java
index 7ff6d53700..8df31ace01 100644
--- a/src/com/itmill/toolkit/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -17,21 +17,21 @@ import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.data.util.ContainerOrderedWrapper;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.event.ItemClickEvent;
-import com.itmill.toolkit.event.Action.Handler;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickListener;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickSource;
-import com.itmill.toolkit.terminal.KeyMapper;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.Property;
+import com.vaadin.data.util.ContainerOrderedWrapper;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.event.Action;
+import com.vaadin.event.ItemClickEvent;
+import com.vaadin.event.Action.Handler;
+import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.event.ItemClickEvent.ItemClickSource;
+import com.vaadin.terminal.KeyMapper;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.gwt.client.MouseEventDetails;
 
 /**
  * <p>
@@ -1666,7 +1666,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * As a side-effect Table's value (selection) is set to null due old
      * selection not necessary exists in new Container.
      * 
-     * @see com.itmill.toolkit.data.Container.Viewer#setContainerDataSource(Container)
+     * @see com.vaadin.data.Container.Viewer#setContainerDataSource(Container)
      */
     @Override
     public void setContainerDataSource(Container newDataSource) {
@@ -1726,7 +1726,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Invoked when the value of a variable has changed.
      * 
-     * @see com.itmill.toolkit.ui.Select#changeVariables(java.lang.Object,
+     * @see com.vaadin.ui.Select#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
     @Override
@@ -1932,7 +1932,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.ui.AbstractSelect#paintContent(com.itmill.toolkit.
+     * com.vaadin.ui.AbstractSelect#paintContent(com.vaadin.
      * terminal.PaintTarget)
      */
     @Override
@@ -2291,7 +2291,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.AbstractSelect#getTag()
+     * @see com.vaadin.ui.AbstractSelect#getTag()
      */
     @Override
     public String getTag() {
@@ -2366,7 +2366,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Registers a new action handler for this container
      * 
-     * @see com.itmill.toolkit.event.Action.Container#addActionHandler(Action.Handler)
+     * @see com.vaadin.event.Action.Container#addActionHandler(Action.Handler)
      */
     public void addActionHandler(Action.Handler actionHandler) {
 
@@ -2389,7 +2389,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Removes a previously registered action handler for the contents of this
      * container.
      * 
-     * @see com.itmill.toolkit.event.Action.Container#removeActionHandler(Action.Handler)
+     * @see com.vaadin.event.Action.Container#removeActionHandler(Action.Handler)
      */
     public void removeActionHandler(Action.Handler actionHandler) {
 
@@ -2413,7 +2413,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * Also listens changes in rendered items to refresh content area.
      * 
-     * @see com.itmill.toolkit.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
+     * @see com.vaadin.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
      */
     @Override
     public void valueChange(Property.ValueChangeEvent event) {
@@ -2438,7 +2438,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Notifies the component that it is connected to an application.
      * 
-     * @see com.itmill.toolkit.ui.Component#attach()
+     * @see com.vaadin.ui.Component#attach()
      */
     @Override
     public void attach() {
@@ -2457,7 +2457,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Notifies the component that it is detached from the application
      * 
-     * @see com.itmill.toolkit.ui.Component#detach()
+     * @see com.vaadin.ui.Component#detach()
      */
     @Override
     public void detach() {
@@ -2474,7 +2474,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Removes all Items from the Container.
      * 
-     * @see com.itmill.toolkit.data.Container#removeAllItems()
+     * @see com.vaadin.data.Container#removeAllItems()
      */
     @Override
     public boolean removeAllItems() {
@@ -2486,7 +2486,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Removes the Item identified by <code>ItemId</code> from the Container.
      * 
-     * @see com.itmill.toolkit.data.Container#removeItem(Object)
+     * @see com.vaadin.data.Container#removeItem(Object)
      */
     @Override
     public boolean removeItem(Object itemId) {
@@ -2506,7 +2506,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Removes a Property specified by the given Property ID from the Container.
      * 
-     * @see com.itmill.toolkit.data.Container#removeContainerProperty(Object)
+     * @see com.vaadin.data.Container#removeContainerProperty(Object)
      */
     @Override
     public boolean removeContainerProperty(Object propertyId)
@@ -2530,7 +2530,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *            the class of the property.
      * @param defaultValue
      *            the default value given for all existing items.
-     * @see com.itmill.toolkit.data.Container#addContainerProperty(Object,
+     * @see com.vaadin.data.Container#addContainerProperty(Object,
      *      Class, Object)
      */
     @Override
@@ -2575,7 +2575,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *            the Alignment of the column. Null implies align left.
      * @throws UnsupportedOperationException
      *             if the operation is not supported.
-     * @see com.itmill.toolkit.data.Container#addContainerProperty(Object,
+     * @see com.vaadin.data.Container#addContainerProperty(Object,
      *      Class, Object)
      */
     public boolean addContainerProperty(Object propertyId, Class type,
@@ -2661,7 +2661,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Returns the list of items on the current page
      * 
-     * @see com.itmill.toolkit.ui.Select#getVisibleItemIds()
+     * @see com.vaadin.ui.Select#getVisibleItemIds()
      */
     @Override
     public Collection getVisibleItemIds() {
@@ -2680,7 +2680,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Container datasource item set change. Table must flush its buffers on
      * change.
      * 
-     * @see com.itmill.toolkit.data.Container.ItemSetChangeListener#containerItemSetChange(com.itmill.toolkit.data.Container.ItemSetChangeEvent)
+     * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent)
      */
     @Override
     public void containerItemSetChange(Container.ItemSetChangeEvent event) {
@@ -2708,7 +2708,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Container datasource property set change. Table must flush its buffers on
      * change.
      * 
-     * @see com.itmill.toolkit.data.Container.PropertySetChangeListener#containerPropertySetChange(com.itmill.toolkit.data.Container.PropertySetChangeEvent)
+     * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent)
      */
     @Override
     public void containerPropertySetChange(
@@ -2724,7 +2724,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @throws UnsupportedOperationException
      *             if set to true.
-     * @see com.itmill.toolkit.ui.Select#setNewItemsAllowed(boolean)
+     * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean)
      */
     @Override
     public void setNewItemsAllowed(boolean allowNewOptions)
@@ -2739,7 +2739,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * 
      * @throws UnsupportedOperationException
      *             if invoked.
-     * @see com.itmill.toolkit.ui.AbstractField#focus()
+     * @see com.vaadin.ui.AbstractField#focus()
      */
     @Override
     public void focus() throws UnsupportedOperationException {
@@ -2749,7 +2749,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the ID of the Item following the Item that corresponds to itemId.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#nextItemId(java.lang.Object)
+     * @see com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object)
      */
     public Object nextItemId(Object itemId) {
         return ((Container.Ordered) items).nextItemId(itemId);
@@ -2759,7 +2759,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Gets the ID of the Item preceding the Item that corresponds to the
      * itemId.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#prevItemId(java.lang.Object)
+     * @see com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object)
      */
     public Object prevItemId(Object itemId) {
         return ((Container.Ordered) items).prevItemId(itemId);
@@ -2768,7 +2768,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the ID of the first Item in the Container.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#firstItemId()
+     * @see com.vaadin.data.Container.Ordered#firstItemId()
      */
     public Object firstItemId() {
         return ((Container.Ordered) items).firstItemId();
@@ -2777,7 +2777,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the ID of the last Item in the Container.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#lastItemId()
+     * @see com.vaadin.data.Container.Ordered#lastItemId()
      */
     public Object lastItemId() {
         return ((Container.Ordered) items).lastItemId();
@@ -2787,7 +2787,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Tests if the Item corresponding to the given Item ID is the first Item in
      * the Container.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#isFirstId(java.lang.Object)
+     * @see com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object)
      */
     public boolean isFirstId(Object itemId) {
         return ((Container.Ordered) items).isFirstId(itemId);
@@ -2797,7 +2797,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Tests if the Item corresponding to the given Item ID is the last Item in
      * the Container.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#isLastId(java.lang.Object)
+     * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object)
      */
     public boolean isLastId(Object itemId) {
         return ((Container.Ordered) items).isLastId(itemId);
@@ -2806,7 +2806,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Adds new item after the given item.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object)
+     * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
     public Object addItemAfter(Object previousItemId)
             throws UnsupportedOperationException {
@@ -2822,7 +2822,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Adds new item after the given item.
      * 
-     * @see com.itmill.toolkit.data.Container.Ordered#addItemAfter(java.lang.Object,
+     * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
      *      java.lang.Object)
      */
     public Item addItemAfter(Object previousItemId, Object newItemId)
@@ -2917,7 +2917,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @throws UnsupportedOperationException
      *             if the container data source does not implement
      *             Container.Sortable
-     * @see com.itmill.toolkit.data.Container.Sortable#sort(java.lang.Object[],
+     * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
      *      boolean[])
      * 
      */
@@ -2955,7 +2955,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the container property IDs, which can be used to sort the item.
      * 
-     * @see com.itmill.toolkit.data.Container.Sortable#getSortableContainerPropertyIds()
+     * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds()
      */
     public Collection getSortableContainerPropertyIds() {
         final Container c = getContainerDataSource();
@@ -3076,7 +3076,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Table does not support lazy options loading mode. Setting this true will
      * throw UnsupportedOperationException.
      * 
-     * @see com.itmill.toolkit.ui.Select#setLazyLoading(boolean)
+     * @see com.vaadin.ui.Select#setLazyLoading(boolean)
      */
     public void setLazyLoading(boolean useLazyLoading) {
         if (useLazyLoading) {
diff --git a/src/com/itmill/toolkit/ui/TextField.java b/src/com/vaadin/ui/TextField.java
index 8c124799d8..626d340922 100644
--- a/src/com/itmill/toolkit/ui/TextField.java
+++ b/src/com/vaadin/ui/TextField.java
@@ -2,14 +2,14 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.text.Format;
 import java.util.Map;
 
-import com.itmill.toolkit.data.Property;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.data.Property;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * <p>
@@ -20,9 +20,9 @@ import com.itmill.toolkit.terminal.PaintTarget;
  * 
  * <p>
  * Since <code>TextField</code> extends <code>AbstractField</code> it implements
- * the {@link com.itmill.toolkit.data.Buffered} interface. A
+ * the {@link com.vaadin.data.Buffered} interface. A
  * <code>TextField</code> is in write-through mode by default, so
- * {@link com.itmill.toolkit.ui.AbstractField#setWriteThrough(boolean)} must be
+ * {@link com.vaadin.ui.AbstractField#setWriteThrough(boolean)} must be
  * called to enable buffering.
  * </p>
  * 
@@ -130,7 +130,7 @@ public class TextField extends AbstractField {
      * Constructs a new <code>TextField</code> with the given caption and
      * initial text contents. The editor constructed this way will not be bound
      * to a Property unless
-     * {@link com.itmill.toolkit.data.Property.Viewer#setPropertyDataSource(Property)}
+     * {@link com.vaadin.data.Property.Viewer#setPropertyDataSource(Property)}
      * is called to bind it.
      * 
      * @param caption
diff --git a/src/com/itmill/toolkit/ui/Tree.java b/src/com/vaadin/ui/Tree.java
index 18b18651f9..0d56384994 100644
--- a/src/com/itmill/toolkit/ui/Tree.java
+++ b/src/com/vaadin/ui/Tree.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -18,19 +18,19 @@ import java.util.Set;
 import java.util.Stack;
 import java.util.StringTokenizer;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.data.Item;
-import com.itmill.toolkit.data.util.ContainerHierarchicalWrapper;
-import com.itmill.toolkit.data.util.IndexedContainer;
-import com.itmill.toolkit.event.Action;
-import com.itmill.toolkit.event.ItemClickEvent;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickListener;
-import com.itmill.toolkit.event.ItemClickEvent.ItemClickSource;
-import com.itmill.toolkit.terminal.KeyMapper;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.data.Container;
+import com.vaadin.data.Item;
+import com.vaadin.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.event.Action;
+import com.vaadin.event.ItemClickEvent;
+import com.vaadin.event.ItemClickEvent.ItemClickListener;
+import com.vaadin.event.ItemClickEvent.ItemClickSource;
+import com.vaadin.terminal.KeyMapper;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.gwt.client.MouseEventDetails;
 
 /**
  * Tree component. A Tree can be used to select an item (or multiple items) from
@@ -320,7 +320,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the UIDL tag corresponding to the component.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#getTag()
+     * @see com.vaadin.ui.AbstractComponent#getTag()
      */
     @Override
     public String getTag() {
@@ -331,7 +331,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * Called when one or more variables handled by the implementing class are
      * changed.
      * 
-     * @see com.itmill.toolkit.terminal.VariableOwner#changeVariables(Object
+     * @see com.vaadin.terminal.VariableOwner#changeVariables(Object
      *      source, Map variables)
      */
     @Override
@@ -408,7 +408,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Paints any needed component-specific things to the given UIDL stream.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#paintContent(PaintTarget)
+     * @see com.vaadin.ui.AbstractComponent#paintContent(PaintTarget)
      */
     @Override
     public void paintContent(PaintTarget target) throws PaintException {
@@ -600,7 +600,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tests if the Item with given ID can have any children.
      * 
-     * @see com.itmill.toolkit.data.Container.Hierarchical#areChildrenAllowed(Object)
+     * @see com.vaadin.data.Container.Hierarchical#areChildrenAllowed(Object)
      */
     public boolean areChildrenAllowed(Object itemId) {
         return ((Container.Hierarchical) items).areChildrenAllowed(itemId);
@@ -609,7 +609,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the IDs of all Items that are children of the specified Item.
      * 
-     * @see com.itmill.toolkit.data.Container.Hierarchical#getChildren(Object)
+     * @see com.vaadin.data.Container.Hierarchical#getChildren(Object)
      */
     public Collection getChildren(Object itemId) {
         return ((Container.Hierarchical) items).getChildren(itemId);
@@ -618,7 +618,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the ID of the parent Item of the specified Item.
      * 
-     * @see com.itmill.toolkit.data.Container.Hierarchical#getParent(Object)
+     * @see com.vaadin.data.Container.Hierarchical#getParent(Object)
      */
     public Object getParent(Object itemId) {
         return ((Container.Hierarchical) items).getParent(itemId);
@@ -627,7 +627,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tests if the Item specified with <code>itemId</code> has child Items.
      * 
-     * @see com.itmill.toolkit.data.Container.Hierarchical#hasChildren(Object)
+     * @see com.vaadin.data.Container.Hierarchical#hasChildren(Object)
      */
     public boolean hasChildren(Object itemId) {
         return ((Container.Hierarchical) items).hasChildren(itemId);
@@ -636,7 +636,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tests if the Item specified with <code>itemId</code> is a root Item.
      * 
-     * @see com.itmill.toolkit.data.Container.Hierarchical#isRoot(Object)
+     * @see com.vaadin.data.Container.Hierarchical#isRoot(Object)
      */
     public boolean isRoot(Object itemId) {
         return ((Container.Hierarchical) items).isRoot(itemId);
@@ -645,7 +645,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the IDs of all Items in the container that don't have a parent.
      * 
-     * @see com.itmill.toolkit.data.Container.Hierarchical#rootItemIds()
+     * @see com.vaadin.data.Container.Hierarchical#rootItemIds()
      */
     public Collection rootItemIds() {
         return ((Container.Hierarchical) items).rootItemIds();
@@ -654,7 +654,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Sets the given Item's capability to have children.
      * 
-     * @see com.itmill.toolkit.data.Container.Hierarchical#setChildrenAllowed(Object,
+     * @see com.vaadin.data.Container.Hierarchical#setChildrenAllowed(Object,
      *      boolean)
      */
     public boolean setChildrenAllowed(Object itemId, boolean areChildrenAllowed) {
@@ -670,7 +670,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * (non-Javadoc)
      * 
      * @see
-     * com.itmill.toolkit.data.Container.Hierarchical#setParent(java.lang.Object
+     * com.vaadin.data.Container.Hierarchical#setParent(java.lang.Object
      * , java.lang.Object)
      */
     public boolean setParent(Object itemId, Object newParentId) {
@@ -687,7 +687,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Sets the Container that serves as the data source of the viewer.
      * 
-     * @see com.itmill.toolkit.data.Container.Viewer#setContainerDataSource(Container)
+     * @see com.vaadin.data.Container.Viewer#setContainerDataSource(Container)
      */
     @Override
     public void setContainerDataSource(Container newDataSource) {
@@ -886,7 +886,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Adds an action handler.
      * 
-     * @see com.itmill.toolkit.event.Action.Container#addActionHandler(Action.Handler)
+     * @see com.vaadin.event.Action.Container#addActionHandler(Action.Handler)
      */
     public void addActionHandler(Action.Handler actionHandler) {
 
@@ -907,7 +907,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Removes an action handler.
      * 
-     * @see com.itmill.toolkit.event.Action.Container#removeActionHandler(Action.Handler)
+     * @see com.vaadin.event.Action.Container#removeActionHandler(Action.Handler)
      */
     public void removeActionHandler(Action.Handler actionHandler) {
 
@@ -927,7 +927,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the visible item ids.
      * 
-     * @see com.itmill.toolkit.ui.Select#getVisibleItemIds()
+     * @see com.vaadin.ui.Select#getVisibleItemIds()
      */
     @Override
     public Collection getVisibleItemIds() {
@@ -971,7 +971,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tree does not support <code>setNullSelectionItemId</code>.
      * 
-     * @see com.itmill.toolkit.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object)
+     * @see com.vaadin.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object)
      */
     @Override
     public void setNullSelectionItemId(Object nullSelectionItemId)
@@ -987,7 +987,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * 
      * @throws UnsupportedOperationException
      *             if set to true.
-     * @see com.itmill.toolkit.ui.Select#setNewItemsAllowed(boolean)
+     * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean)
      */
     @Override
     public void setNewItemsAllowed(boolean allowNewOptions)
@@ -1002,7 +1002,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * 
      * @throws UnsupportedOperationException
      *             if invoked.
-     * @see com.itmill.toolkit.ui.AbstractField#focus()
+     * @see com.vaadin.ui.AbstractField#focus()
      */
     @Override
     public void focus() throws UnsupportedOperationException {
@@ -1013,7 +1013,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      * Tree does not support lazy options loading mode. Setting this true will
      * throw UnsupportedOperationException.
      * 
-     * @see com.itmill.toolkit.ui.Select#setLazyLoading(boolean)
+     * @see com.vaadin.ui.Select#setLazyLoading(boolean)
      */
     public void setLazyLoading(boolean useLazyLoading) {
         if (useLazyLoading) {
diff --git a/src/com/itmill/toolkit/ui/TwinColSelect.java b/src/com/vaadin/ui/TwinColSelect.java
index ac00498418..a619a5a0a9 100644
--- a/src/com/itmill/toolkit/ui/TwinColSelect.java
+++ b/src/com/vaadin/ui/TwinColSelect.java
@@ -2,13 +2,13 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.util.Collection;
 
-import com.itmill.toolkit.data.Container;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.data.Container;
+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/src/com/itmill/toolkit/ui/Upload.java b/src/com/vaadin/ui/Upload.java
index 2b4620f322..238217a4c2 100644
--- a/src/com/itmill/toolkit/ui/Upload.java
+++ b/src/com/vaadin/ui/Upload.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -12,10 +12,10 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.UploadStream;
+import com.vaadin.Application;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.UploadStream;
 
 /**
  * Component for uploading files from client to server.
@@ -190,7 +190,7 @@ public class Upload extends AbstractComponent implements Component.Focusable {
     /**
      * Invoked when the value of a variable has changed.
      * 
-     * @see com.itmill.toolkit.ui.AbstractComponent#changeVariables(java.lang.Object,
+     * @see com.vaadin.ui.AbstractComponent#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
     @Override
@@ -824,7 +824,7 @@ public class Upload extends AbstractComponent implements Component.Focusable {
     /*
      * (non-Javadoc)
      * 
-     * @see com.itmill.toolkit.ui.Component.Focusable#focus()
+     * @see com.vaadin.ui.Component.Focusable#focus()
      */
     public void focus() {
         final Application app = getApplication();
@@ -839,7 +839,7 @@ public class Upload extends AbstractComponent implements Component.Focusable {
     /**
      * Gets the Tabulator index of this Focusable component.
      * 
-     * @see com.itmill.toolkit.ui.Component.Focusable#getTabIndex()
+     * @see com.vaadin.ui.Component.Focusable#getTabIndex()
      */
     public int getTabIndex() {
         return tabIndex;
@@ -848,7 +848,7 @@ public class Upload extends AbstractComponent implements Component.Focusable {
     /**
      * Sets the Tabulator index of this Focusable component.
      * 
-     * @see com.itmill.toolkit.ui.Component.Focusable#setTabIndex(int)
+     * @see com.vaadin.ui.Component.Focusable#setTabIndex(int)
      */
     public void setTabIndex(int tabIndex) {
         this.tabIndex = tabIndex;
@@ -972,7 +972,7 @@ public class Upload extends AbstractComponent implements Component.Focusable {
     /**
      * Notifies the component that it is connected to an application.
      * 
-     * @see com.itmill.toolkit.ui.Component#attach()
+     * @see com.vaadin.ui.Component#attach()
      */
     @Override
     public void attach() {
diff --git a/src/com/itmill/toolkit/ui/UriFragmentUtility.java b/src/com/vaadin/ui/UriFragmentUtility.java
index 3852bdc7d2..ad00386369 100644
--- a/src/com/itmill/toolkit/ui/UriFragmentUtility.java
+++ b/src/com/vaadin/ui/UriFragmentUtility.java
@@ -1,12 +1,12 @@
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import com.itmill.toolkit.service.ApplicationContext.TransactionListener;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
+import com.vaadin.service.ApplicationContext.TransactionListener;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
 
 /**
  * Experimental web browser dependent component for URI fragment (part after
diff --git a/src/com/itmill/toolkit/ui/VerticalLayout.java b/src/com/vaadin/ui/VerticalLayout.java
index 21934bbd0f..55f70a740f 100644
--- a/src/com/itmill/toolkit/ui/VerticalLayout.java
+++ b/src/com/vaadin/ui/VerticalLayout.java
@@ -1,4 +1,4 @@
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 /**
  * Vertical layout
diff --git a/src/com/itmill/toolkit/ui/Window.java b/src/com/vaadin/ui/Window.java
index 1818054947..90b761652c 100644
--- a/src/com/itmill/toolkit/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -2,7 +2,7 @@
 @ITMillApache2LicenseForJavaFiles@
  */
 
-package com.itmill.toolkit.ui;
+package com.vaadin.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -15,15 +15,15 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 
-import com.itmill.toolkit.Application;
-import com.itmill.toolkit.terminal.DownloadStream;
-import com.itmill.toolkit.terminal.PaintException;
-import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.ParameterHandler;
-import com.itmill.toolkit.terminal.Resource;
-import com.itmill.toolkit.terminal.Sizeable;
-import com.itmill.toolkit.terminal.Terminal;
-import com.itmill.toolkit.terminal.URIHandler;
+import com.vaadin.Application;
+import com.vaadin.terminal.DownloadStream;
+import com.vaadin.terminal.PaintException;
+import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.ParameterHandler;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.Sizeable;
+import com.vaadin.terminal.Terminal;
+import com.vaadin.terminal.URIHandler;
 
 /**
  * Application window component.
@@ -708,9 +708,9 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
      * 
      * <p>
      * This method should not be invoked directly. Instead the
-     * {@link com.itmill.toolkit.Application#addWindow(Window)} method should be
+     * {@link com.vaadin.Application#addWindow(Window)} method should be
      * used to add the window to an application and
-     * {@link com.itmill.toolkit.Application#removeWindow(Window)} method for
+     * {@link com.vaadin.Application#removeWindow(Window)} method for
      * removing the window from the applicion. These methods call this method
      * implicitly.
      * </p>
@@ -851,7 +851,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
      * Called when one or more variables handled by the implementing class are
      * changed.
      * 
-     * @see com.itmill.toolkit.terminal.VariableOwner#changeVariables(java.lang.Object,
+     * @see com.vaadin.terminal.VariableOwner#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
     @Override
@@ -1086,7 +1086,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
     /**
      * Listener for window resize events.
      * 
-     * @see com.itmill.toolkit.ui.Window.ResizeEvent
+     * @see com.vaadin.ui.Window.ResizeEvent
      */
     public interface ResizeListener extends Serializable {
         public void windowResized(ResizeEvent e);
@@ -1239,7 +1239,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
      * Shows a notification message on the middle of the window. The message
      * automatically disappears ("humanized message").
      * 
-     * @see #showNotification(com.itmill.toolkit.ui.Window.Notification)
+     * @see #showNotification(com.vaadin.ui.Window.Notification)
      * @see Notification
      * 
      * @param caption
@@ -1254,7 +1254,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
      * message depends on the type, which is one of the basic types defined in
      * {@link Notification}, for instance Notification.TYPE_WARNING_MESSAGE.
      * 
-     * @see #showNotification(com.itmill.toolkit.ui.Window.Notification)
+     * @see #showNotification(com.vaadin.ui.Window.Notification)
      * @see Notification
      * 
      * @param caption
@@ -1271,7 +1271,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
      * description on the middle of the window. The message automatically
      * disappears ("humanized message").
      * 
-     * @see #showNotification(com.itmill.toolkit.ui.Window.Notification)
+     * @see #showNotification(com.vaadin.ui.Window.Notification)
      * @see Notification
      * 
      * @param caption
@@ -1290,7 +1290,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
      * type, which is one of the basic types defined in {@link Notification},
      * for instance Notification.TYPE_WARNING_MESSAGE.
      * 
-     * @see #showNotification(com.itmill.toolkit.ui.Window.Notification)
+     * @see #showNotification(com.vaadin.ui.Window.Notification)
      * @see Notification
      * 
      * @param caption
diff --git a/src/com/itmill/toolkit/ui/doc-files/component_class_hierarchy.gif b/src/com/vaadin/ui/doc-files/component_class_hierarchy.gif
index 936c220d11..936c220d11 100644
--- a/src/com/itmill/toolkit/ui/doc-files/component_class_hierarchy.gif
+++ b/src/com/vaadin/ui/doc-files/component_class_hierarchy.gif
diff --git a/src/com/itmill/toolkit/ui/doc-files/component_interfaces.gif b/src/com/vaadin/ui/doc-files/component_interfaces.gif
index 44c99826bb..44c99826bb 100644
--- a/src/com/itmill/toolkit/ui/doc-files/component_interfaces.gif
+++ b/src/com/vaadin/ui/doc-files/component_interfaces.gif
diff --git a/src/com/itmill/toolkit/ui/package.html b/src/com/vaadin/ui/package.html
index ad4fe933f6..2a26453a1f 100644
--- a/src/com/itmill/toolkit/ui/package.html
+++ b/src/com/vaadin/ui/package.html
@@ -23,22 +23,22 @@ package includes several other lesser subinterfaces which are not
 significant in this scope. The interfaces not appearing here are documented
 with the classes that define them.</i></p>
 
-<p>The {@link com.itmill.toolkit.ui.Component) interface is the top-level
+<p>The {@link com.vaadin.ui.Component) interface is the top-level
 interface which must be implemented by all UI components. It defines the
 common properties of the components and how the framework will handle
-them. Most simple components (like {@link com.itmill.toolkit.ui.Button} for
+them. Most simple components (like {@link com.vaadin.ui.Button} for
 example} won't need to implement the lower level interfaces described
 below. Note that the classes and interfaces required by the component event
-framework are defined in {@link com.itmill.toolkit.ui.Component}.</p>
+framework are defined in {@link com.vaadin.ui.Component}.</p>
 
 <p>The next level in the component hierarchy are the classes implementing
-the {@link com.itmill.toolkit.ui.ComponentContainer} interface. It adds the
+the {@link com.vaadin.ui.ComponentContainer} interface. It adds the
 capacity to contain other components to
-{@link com.itmill.toolkit.ui.Component} with a simple API.</p>
+{@link com.vaadin.ui.Component} with a simple API.</p>
 
-<p>The third and last level is the {@link com.itmill.toolkit.ui.Layout},
+<p>The third and last level is the {@link com.vaadin.ui.Layout},
 which adds the concept of location to the components contained in a
-{@link com.itmill.toolkit.ui.ComponentContainer}. It can be used to create
+{@link com.vaadin.ui.ComponentContainer}. It can be used to create
 containers whose contents can be positioned arbitrarily.</p>
 
 <p><strong>Component class hierarchy</strong></p>
@@ -49,17 +49,17 @@ containers whose contents can be positioned arbitrarily.</p>
 
 <center><i>Underlined classes are abstract.</i></center>
 
-<p>At the top level is {@link com.itmill.toolkit.ui.AbstractComponent}
-which implements the {@link com.itmill.toolkit.ui.Component} interface. As
+<p>At the top level is {@link com.vaadin.ui.AbstractComponent}
+which implements the {@link com.vaadin.ui.Component} interface. As
 the name suggests it is abstract, but it does include a default
 implementation for all methods defined in <code>Component</code> so that
 a component is free to override only those functionalities it needs.</p>
 
 <p>As seen in the picture, <code>AbstractComponent</code> serves as the
 superclass for several "real" components, but it also has a some abstract
-extensions. {@link com.itmill.toolkit.ui.AbstractComponentContainer} serves
+extensions. {@link com.vaadin.ui.AbstractComponentContainer} serves
 as the root class for all components (for example, panels and windows) who
-can contain other components. {@link com.itmill.toolkit.ui.AbstractField},
+can contain other components. {@link com.vaadin.ui.AbstractField},
 on the other hand, implements several interfaces to provide a base class for
 components that are used for data display and manipulation.</p>