139 files changed, 357 insertions, 358 deletions
diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java
index bdad94355d..a406617288 100644
--- a/server/src/com/vaadin/Application.java
+++ b/server/src/com/vaadin/Application.java
@@ -51,19 +51,19 @@ import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.ConverterFactory;
 import com.vaadin.data.util.converter.DefaultConverterFactory;
 import com.vaadin.event.EventRouter;
+import com.vaadin.server.AbstractErrorMessage;
+import com.vaadin.server.ApplicationResource;
+import com.vaadin.server.CombinedRequest;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.Terminal;
+import com.vaadin.server.UIProvider;
+import com.vaadin.server.VariableOwner;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
+import com.vaadin.server.WrappedRequest.BrowserDetails;
 import com.vaadin.service.ApplicationContext;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.AbstractErrorMessage;
-import com.vaadin.terminal.ApplicationResource;
-import com.vaadin.terminal.CombinedRequest;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.Terminal;
-import com.vaadin.terminal.UIProvider;
-import com.vaadin.terminal.VariableOwner;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedRequest.BrowserDetails;
-import com.vaadin.terminal.WrappedResponse;
 import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
 import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse;
 import com.vaadin.terminal.gwt.server.BootstrapListener;
@@ -123,7 +123,7 @@ import com.vaadin.ui.Window;
  * found out, the window itself is queried for a preferred theme. If the window
  * does not prefer a specific theme, the application containing the window is
  * queried. If neither the application prefers a theme, the default theme for
- * the {@link com.vaadin.terminal.Terminal terminal} is used. The terminal
+ * the {@link com.vaadin.server.Terminal terminal} is used. The terminal
  * always defines a default theme.
  * </p>
  * 
@@ -1075,7 +1075,7 @@ public class Application implements Terminal.ErrorListener, Serializable {
      * 
      * @param event
      *            the change event.
-     * @see com.vaadin.terminal.Terminal.ErrorListener#terminalError(com.vaadin.terminal.Terminal.ErrorEvent)
+     * @see com.vaadin.server.Terminal.ErrorListener#terminalError(com.vaadin.server.Terminal.ErrorEvent)
      */
 
     @Override
diff --git a/server/src/com/vaadin/UIRequiresMoreInformationException.java b/server/src/com/vaadin/UIRequiresMoreInformationException.java
index 493c31acb6..76a31d88ef 100644
--- a/server/src/com/vaadin/UIRequiresMoreInformationException.java
+++ b/server/src/com/vaadin/UIRequiresMoreInformationException.java
@@ -16,8 +16,8 @@
 
 package com.vaadin;
 
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedRequest.BrowserDetails;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedRequest.BrowserDetails;
 
 /**
  * Exception that is thrown to indicate that creating or initializing the UI
diff --git a/server/src/com/vaadin/annotations/EagerInit.java b/server/src/com/vaadin/annotations/EagerInit.java
index 462c6bb5ac..f08d46b551 100644
--- a/server/src/com/vaadin/annotations/EagerInit.java
+++ b/server/src/com/vaadin/annotations/EagerInit.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /**
@@ -29,7 +29,7 @@ import com.vaadin.ui.UI;
  * This will make the UI appear more quickly, as ensuring the availability of
  * this information typically requires an additional round trip to the client.
  * 
- * @see UI#init(com.vaadin.terminal.WrappedRequest)
+ * @see UI#init(com.vaadin.server.WrappedRequest)
  * @see WrappedRequest#getBrowserDetails()
  * 
  * @since 7.0
diff --git a/server/src/com/vaadin/data/util/FilesystemContainer.java b/server/src/com/vaadin/data/util/FilesystemContainer.java
index 54ee2d6f0c..4c27169409 100644
--- a/server/src/com/vaadin/data/util/FilesystemContainer.java
+++ b/server/src/com/vaadin/data/util/FilesystemContainer.java
@@ -33,8 +33,8 @@ import java.util.List;
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
+import com.vaadin.server.Resource;
 import com.vaadin.service.FileTypeResolver;
-import com.vaadin.terminal.Resource;
 
 /**
  * A hierarchical container wrapper for a filesystem.
diff --git a/server/src/com/vaadin/event/Action.java b/server/src/com/vaadin/event/Action.java
index aca28940a1..b8296418d3 100644
--- a/server/src/com/vaadin/event/Action.java
+++ b/server/src/com/vaadin/event/Action.java
@@ -18,7 +18,7 @@ package com.vaadin.event;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.Resource;
 
 /**
  * Implements the action framework. This class contains subinterfaces for action
diff --git a/server/src/com/vaadin/event/ActionManager.java b/server/src/com/vaadin/event/ActionManager.java
index 296d12ba92..85a1bf0f12 100644
--- a/server/src/com/vaadin/event/ActionManager.java
+++ b/server/src/com/vaadin/event/ActionManager.java
@@ -20,10 +20,10 @@ import java.util.Map;
 
 import com.vaadin.event.Action.Container;
 import com.vaadin.event.Action.Handler;
-import com.vaadin.terminal.KeyMapper;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.VariableOwner;
+import com.vaadin.server.KeyMapper;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.VariableOwner;
 import com.vaadin.ui.Component;
 
 /**
diff --git a/server/src/com/vaadin/event/ShortcutAction.java b/server/src/com/vaadin/event/ShortcutAction.java
index b3f41b474d..b1d14b15fe 100644
--- a/server/src/com/vaadin/event/ShortcutAction.java
+++ b/server/src/com/vaadin/event/ShortcutAction.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.Resource;
 import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Window;
diff --git a/server/src/com/vaadin/event/ShortcutListener.java b/server/src/com/vaadin/event/ShortcutListener.java
index 82a09585b3..d7e0577e84 100644
--- a/server/src/com/vaadin/event/ShortcutListener.java
+++ b/server/src/com/vaadin/event/ShortcutListener.java
@@ -16,7 +16,7 @@
 package com.vaadin.event;
 
 import com.vaadin.event.Action.Listener;
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.Resource;
 
 public abstract class ShortcutListener extends ShortcutAction implements
         Listener {
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
index 7b04efc4b3..850e68b231 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/AcceptCriterion.java
@@ -23,8 +23,8 @@ import java.io.Serializable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * Criterion that can be used create policy to accept/discard dragged content
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/And.java b/server/src/com/vaadin/event/dd/acceptcriteria/And.java
index 3d11ecf7bf..183010a298 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/And.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/And.java
@@ -19,8 +19,8 @@
 package com.vaadin.event.dd.acceptcriteria;
 
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * A compound criterion that accepts the drag if all of its criteria accepts the
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java
index be7e2d4033..e862cdfd39 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/ClientSideCriterion.java
@@ -17,8 +17,8 @@ package com.vaadin.event.dd.acceptcriteria;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * Parent class for criteria that can be completely validated on client side.
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java b/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java
index 55ee17fea9..97094814ef 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java
@@ -20,8 +20,8 @@ package com.vaadin.event.dd.acceptcriteria;
 
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * A Criterion that checks whether {@link Transferable} contains given data
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/Not.java b/server/src/com/vaadin/event/dd/acceptcriteria/Not.java
index b3f73699ea..9e1b1571ae 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/Not.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/Not.java
@@ -19,8 +19,8 @@
 package com.vaadin.event.dd.acceptcriteria;
 
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * Criterion that wraps another criterion and inverts its return value.
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/Or.java b/server/src/com/vaadin/event/dd/acceptcriteria/Or.java
index 42d1c3293d..7aa7d8cd20 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/Or.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/Or.java
@@ -19,8 +19,8 @@
 package com.vaadin.event.dd.acceptcriteria;
 
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * A compound criterion that accepts the drag if any of its criterion accepts
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java b/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java
index b9c2855021..b7457605b8 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/ServerSideCriterion.java
@@ -18,8 +18,8 @@ package com.vaadin.event.dd.acceptcriteria;
 import java.io.Serializable;
 
 import com.vaadin.event.Transferable;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * Parent class for criteria which are verified on the server side during a drag
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java b/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java
index cc1d586076..6258aed423 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java
@@ -23,8 +23,8 @@ import java.util.logging.Logger;
 
 import com.vaadin.event.TransferableImpl;
 import com.vaadin.event.dd.DragAndDropEvent;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 import com.vaadin.ui.Component;
 
 /**
diff --git a/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java b/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
index 536ba8780e..a6d3e2c5d5 100644
--- a/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
+++ b/server/src/com/vaadin/event/dd/acceptcriteria/TargetDetailIs.java
@@ -20,8 +20,8 @@ package com.vaadin.event.dd.acceptcriteria;
 
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.TargetDetails;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * Criterion for checking if drop target details contains the specific property
diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java
index 13e87c16ad..1fa11184b9 100644
--- a/server/src/com/vaadin/navigator/Navigator.java
+++ b/server/src/com/vaadin/navigator/Navigator.java
@@ -22,9 +22,9 @@ import java.util.LinkedList;
 import java.util.List;
 
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Page.FragmentChangedEvent;
-import com.vaadin.terminal.Page.FragmentChangedListener;
+import com.vaadin.server.Page;
+import com.vaadin.server.Page.FragmentChangedEvent;
+import com.vaadin.server.Page.FragmentChangedListener;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.CssLayout;
diff --git a/server/src/com/vaadin/terminal/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java
index 157bd17e41..2a0d1e4425 100644
--- a/server/src/com/vaadin/terminal/AbstractClientConnector.java
+++ b/server/src/com/vaadin/server/AbstractClientConnector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
diff --git a/server/src/com/vaadin/terminal/AbstractErrorMessage.java b/server/src/com/vaadin/server/AbstractErrorMessage.java
index 808791158a..13bddcc6ca 100644
--- a/server/src/com/vaadin/terminal/AbstractErrorMessage.java
+++ b/server/src/com/vaadin/server/AbstractErrorMessage.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/server/src/com/vaadin/terminal/AbstractExtension.java b/server/src/com/vaadin/server/AbstractExtension.java
index 8ac0ce01e3..5693d1a29f 100644
--- a/server/src/com/vaadin/terminal/AbstractExtension.java
+++ b/server/src/com/vaadin/server/AbstractExtension.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import com.vaadin.terminal.gwt.server.ClientConnector;
 
diff --git a/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java b/server/src/com/vaadin/server/AbstractJavaScriptExtension.java
index c8700d12ab..20e2752801 100644
--- a/server/src/com/vaadin/terminal/AbstractJavaScriptExtension.java
+++ b/server/src/com/vaadin/server/AbstractJavaScriptExtension.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import com.vaadin.shared.JavaScriptExtensionState;
 import com.vaadin.ui.JavaScriptFunction;
diff --git a/server/src/com/vaadin/terminal/AbstractUIProvider.java b/server/src/com/vaadin/server/AbstractUIProvider.java
index 5bb4d35b30..ba8e266eb2 100644
--- a/server/src/com/vaadin/terminal/AbstractUIProvider.java
+++ b/server/src/com/vaadin/server/AbstractUIProvider.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import com.vaadin.Application;
 import com.vaadin.ui.UI;
diff --git a/server/src/com/vaadin/terminal/ApplicationResource.java b/server/src/com/vaadin/server/ApplicationResource.java
index 1d1444b774..b18886ed55 100644
--- a/server/src/com/vaadin/terminal/ApplicationResource.java
+++ b/server/src/com/vaadin/server/ApplicationResource.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/ClassResource.java b/server/src/com/vaadin/server/ClassResource.java
index e4921f2413..4b4837faa3 100644
--- a/server/src/com/vaadin/terminal/ClassResource.java
+++ b/server/src/com/vaadin/server/ClassResource.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
@@ -97,7 +97,7 @@ public class ClassResource implements ApplicationResource, Serializable {
     /**
      * Gets the MIME type of this resource.
      * 
-     * @see com.vaadin.terminal.Resource#getMIMEType()
+     * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
     public String getMIMEType() {
@@ -107,7 +107,7 @@ public class ClassResource implements ApplicationResource, Serializable {
     /**
      * Gets the application of this resource.
      * 
-     * @see com.vaadin.terminal.ApplicationResource#getApplication()
+     * @see com.vaadin.server.ApplicationResource#getApplication()
      */
     @Override
     public Application getApplication() {
@@ -118,7 +118,7 @@ public class ClassResource implements ApplicationResource, Serializable {
      * Gets the virtual filename for this resource.
      * 
      * @return the file name associated to this resource.
-     * @see com.vaadin.terminal.ApplicationResource#getFilename()
+     * @see com.vaadin.server.ApplicationResource#getFilename()
      */
     @Override
     public String getFilename() {
@@ -134,7 +134,7 @@ public class ClassResource implements ApplicationResource, Serializable {
     /**
      * Gets resource as stream.
      * 
-     * @see com.vaadin.terminal.ApplicationResource#getStream()
+     * @see com.vaadin.server.ApplicationResource#getStream()
      */
     @Override
     public DownloadStream getStream() {
diff --git a/server/src/com/vaadin/terminal/CombinedRequest.java b/server/src/com/vaadin/server/CombinedRequest.java
index 3d6c3c2149..a7a4040c35 100644
--- a/server/src/com/vaadin/terminal/CombinedRequest.java
+++ b/server/src/com/vaadin/server/CombinedRequest.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/server/src/com/vaadin/terminal/CompositeErrorMessage.java b/server/src/com/vaadin/server/CompositeErrorMessage.java
index e86102ae3b..f51ba559eb 100644
--- a/server/src/com/vaadin/terminal/CompositeErrorMessage.java
+++ b/server/src/com/vaadin/server/CompositeErrorMessage.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/server/src/com/vaadin/terminal/DefaultUIProvider.java b/server/src/com/vaadin/server/DefaultUIProvider.java
index 8713c45b31..913402c89f 100644
--- a/server/src/com/vaadin/terminal/DefaultUIProvider.java
+++ b/server/src/com/vaadin/server/DefaultUIProvider.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
diff --git a/server/src/com/vaadin/terminal/DeploymentConfiguration.java b/server/src/com/vaadin/server/DeploymentConfiguration.java
index 0cfbdb7544..d365c4ce18 100644
--- a/server/src/com/vaadin/terminal/DeploymentConfiguration.java
+++ b/server/src/com/vaadin/server/DeploymentConfiguration.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.util.Iterator;
diff --git a/server/src/com/vaadin/terminal/DownloadStream.java b/server/src/com/vaadin/server/DownloadStream.java
index 30810d5da4..5d3b083f1e 100644
--- a/server/src/com/vaadin/terminal/DownloadStream.java
+++ b/server/src/com/vaadin/server/DownloadStream.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/server/src/com/vaadin/terminal/ErrorMessage.java b/server/src/com/vaadin/server/ErrorMessage.java
index 15273efb6f..fcc481e826 100644
--- a/server/src/com/vaadin/terminal/ErrorMessage.java
+++ b/server/src/com/vaadin/server/ErrorMessage.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/Extension.java b/server/src/com/vaadin/server/Extension.java
index 87901c3c13..cf0dad5d1a 100644
--- a/server/src/com/vaadin/terminal/Extension.java
+++ b/server/src/com/vaadin/server/Extension.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import com.vaadin.terminal.gwt.server.ClientConnector;
 
diff --git a/server/src/com/vaadin/terminal/ExternalResource.java b/server/src/com/vaadin/server/ExternalResource.java
index d970c0934b..925b0589f3 100644
--- a/server/src/com/vaadin/terminal/ExternalResource.java
+++ b/server/src/com/vaadin/server/ExternalResource.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.net.URL;
@@ -108,7 +108,7 @@ public class ExternalResource implements Resource, Serializable {
     /**
      * Gets the MIME type of the resource.
      * 
-     * @see com.vaadin.terminal.Resource#getMIMEType()
+     * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
     public String getMIMEType() {
diff --git a/server/src/com/vaadin/terminal/FileResource.java b/server/src/com/vaadin/server/FileResource.java
index ab8bc95ce3..7b3f338b4f 100644
--- a/server/src/com/vaadin/terminal/FileResource.java
+++ b/server/src/com/vaadin/server/FileResource.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
 import com.vaadin.Application;
+import com.vaadin.server.Terminal.ErrorEvent;
 import com.vaadin.service.FileTypeResolver;
-import com.vaadin.terminal.Terminal.ErrorEvent;
 
 /**
  * <code>FileResources</code> are files or directories on local filesystem. The
@@ -69,7 +69,7 @@ public class FileResource implements ApplicationResource {
     /**
      * Gets the resource as stream.
      * 
-     * @see com.vaadin.terminal.ApplicationResource#getStream()
+     * @see com.vaadin.server.ApplicationResource#getStream()
      */
     @Override
     public DownloadStream getStream() {
@@ -116,7 +116,7 @@ public class FileResource implements ApplicationResource {
     }
 
     /**
-     * @see com.vaadin.terminal.ApplicationResource#getApplication()
+     * @see com.vaadin.server.ApplicationResource#getApplication()
      */
     @Override
     public Application getApplication() {
@@ -124,7 +124,7 @@ public class FileResource implements ApplicationResource {
     }
 
     /**
-     * @see com.vaadin.terminal.ApplicationResource#getFilename()
+     * @see com.vaadin.server.ApplicationResource#getFilename()
      */
     @Override
     public String getFilename() {
@@ -132,7 +132,7 @@ public class FileResource implements ApplicationResource {
     }
 
     /**
-     * @see com.vaadin.terminal.Resource#getMIMEType()
+     * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
     public String getMIMEType() {
diff --git a/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java b/server/src/com/vaadin/server/JavaScriptCallbackHelper.java
index 17fa2cbd32..19b19ce824 100644
--- a/server/src/com/vaadin/terminal/JavaScriptCallbackHelper.java
+++ b/server/src/com/vaadin/server/JavaScriptCallbackHelper.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
diff --git a/server/src/com/vaadin/terminal/KeyMapper.java b/server/src/com/vaadin/server/KeyMapper.java
index cf54af545f..86714cfc66 100644
--- a/server/src/com/vaadin/terminal/KeyMapper.java
+++ b/server/src/com/vaadin/server/KeyMapper.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/server/src/com/vaadin/terminal/LegacyPaint.java b/server/src/com/vaadin/server/LegacyPaint.java
index 3db0f52079..a5e16bb24b 100644
--- a/server/src/com/vaadin/terminal/LegacyPaint.java
+++ b/server/src/com/vaadin/server/LegacyPaint.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.PaintTarget.PaintStatus;
+import com.vaadin.server.PaintTarget.PaintStatus;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HasComponents;
 
diff --git a/server/src/com/vaadin/terminal/Page.java b/server/src/com/vaadin/server/Page.java
index 66ef7da296..4cb9a1291e 100644
--- a/server/src/com/vaadin/terminal/Page.java
+++ b/server/src/com/vaadin/server/Page.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -24,10 +24,10 @@ import java.util.LinkedList;
 import java.util.List;
 
 import com.vaadin.event.EventRouter;
+import com.vaadin.server.WrappedRequest.BrowserDetails;
 import com.vaadin.shared.ui.BorderStyle;
 import com.vaadin.shared.ui.ui.PageClientRpc;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.WrappedRequest.BrowserDetails;
 import com.vaadin.terminal.gwt.server.WebApplicationContext;
 import com.vaadin.terminal.gwt.server.WebBrowser;
 import com.vaadin.tools.ReflectTools;
diff --git a/server/src/com/vaadin/terminal/PaintException.java b/server/src/com/vaadin/server/PaintException.java
index dd5752653a..5d6f7b1d58 100644
--- a/server/src/com/vaadin/terminal/PaintException.java
+++ b/server/src/com/vaadin/server/PaintException.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/server/src/com/vaadin/terminal/PaintTarget.java b/server/src/com/vaadin/server/PaintTarget.java
index fd349310f6..e50fac1cb4 100644
--- a/server/src/com/vaadin/terminal/PaintTarget.java
+++ b/server/src/com/vaadin/server/PaintTarget.java
@@ -14,12 +14,12 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.util.Map;
 
-import com.vaadin.terminal.StreamVariable.StreamingStartEvent;
+import com.vaadin.server.StreamVariable.StreamingStartEvent;
 import com.vaadin.terminal.gwt.server.ClientConnector;
 import com.vaadin.ui.Component;
 
diff --git a/server/src/com/vaadin/terminal/RequestHandler.java b/server/src/com/vaadin/server/RequestHandler.java
index 2ea02487b1..fcc506cc54 100644
--- a/server/src/com/vaadin/terminal/RequestHandler.java
+++ b/server/src/com/vaadin/server/RequestHandler.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/server/src/com/vaadin/terminal/Resource.java b/server/src/com/vaadin/server/Resource.java
index 27adb16869..fa1e040929 100644
--- a/server/src/com/vaadin/terminal/Resource.java
+++ b/server/src/com/vaadin/server/Resource.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/Scrollable.java b/server/src/com/vaadin/server/Scrollable.java
index 641b20ab34..ca89d598c5 100644
--- a/server/src/com/vaadin/terminal/Scrollable.java
+++ b/server/src/com/vaadin/server/Scrollable.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/Sizeable.java b/server/src/com/vaadin/server/Sizeable.java
index d8d0b0e043..36562a059d 100644
--- a/server/src/com/vaadin/terminal/Sizeable.java
+++ b/server/src/com/vaadin/server/Sizeable.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/StreamResource.java b/server/src/com/vaadin/server/StreamResource.java
index bbb58c71e2..443831129f 100644
--- a/server/src/com/vaadin/terminal/StreamResource.java
+++ b/server/src/com/vaadin/server/StreamResource.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.InputStream;
 import java.io.Serializable;
@@ -87,7 +87,7 @@ public class StreamResource implements ApplicationResource {
     }
 
     /**
-     * @see com.vaadin.terminal.Resource#getMIMEType()
+     * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
     public String getMIMEType() {
@@ -150,7 +150,7 @@ public class StreamResource implements ApplicationResource {
     }
 
     /**
-     * @see com.vaadin.terminal.ApplicationResource#getApplication()
+     * @see com.vaadin.server.ApplicationResource#getApplication()
      */
     @Override
     public Application getApplication() {
@@ -158,7 +158,7 @@ public class StreamResource implements ApplicationResource {
     }
 
     /**
-     * @see com.vaadin.terminal.ApplicationResource#getStream()
+     * @see com.vaadin.server.ApplicationResource#getStream()
      */
     @Override
     public DownloadStream getStream() {
diff --git a/server/src/com/vaadin/terminal/StreamVariable.java b/server/src/com/vaadin/server/StreamVariable.java
index 53f398f09c..f289e7612a 100644
--- a/server/src/com/vaadin/terminal/StreamVariable.java
+++ b/server/src/com/vaadin/server/StreamVariable.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.OutputStream;
 import java.io.Serializable;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.StreamVariable.StreamingEndEvent;
-import com.vaadin.terminal.StreamVariable.StreamingErrorEvent;
-import com.vaadin.terminal.StreamVariable.StreamingStartEvent;
+import com.vaadin.server.StreamVariable.StreamingEndEvent;
+import com.vaadin.server.StreamVariable.StreamingErrorEvent;
+import com.vaadin.server.StreamVariable.StreamingStartEvent;
 
 /**
  * StreamVariable is a special kind of variable whose value is streamed to an
@@ -152,7 +152,7 @@ public interface StreamVariable extends Serializable {
      * the streaming ended before the end of the input. The streaming may fail
      * due an interruption by {@link } or due an other unknown exception in
      * communication. In the latter case the exception is also passed to
-     * {@link Application#terminalError(com.vaadin.terminal.Terminal.ErrorEvent)}
+     * {@link Application#terminalError(com.vaadin.server.Terminal.ErrorEvent)}
      * .
      */
     public interface StreamingErrorEvent extends StreamingEvent {
diff --git a/server/src/com/vaadin/terminal/SystemError.java b/server/src/com/vaadin/server/SystemError.java
index c4cb7eef0c..453be4f632 100644
--- a/server/src/com/vaadin/terminal/SystemError.java
+++ b/server/src/com/vaadin/server/SystemError.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
 
diff --git a/server/src/com/vaadin/terminal/Terminal.java b/server/src/com/vaadin/server/Terminal.java
index a02bcb50bb..265668aa42 100644
--- a/server/src/com/vaadin/terminal/Terminal.java
+++ b/server/src/com/vaadin/server/Terminal.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
diff --git a/server/src/com/vaadin/terminal/ThemeResource.java b/server/src/com/vaadin/server/ThemeResource.java
index 61fe157ee6..7ae0bab828 100644
--- a/server/src/com/vaadin/terminal/ThemeResource.java
+++ b/server/src/com/vaadin/server/ThemeResource.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import com.vaadin.service.FileTypeResolver;
 
@@ -97,7 +97,7 @@ public class ThemeResource implements Resource {
     }
 
     /**
-     * @see com.vaadin.terminal.Resource#getMIMEType()
+     * @see com.vaadin.server.Resource#getMIMEType()
      */
     @Override
     public String getMIMEType() {
diff --git a/server/src/com/vaadin/terminal/UIProvider.java b/server/src/com/vaadin/server/UIProvider.java
index 27b63fbcac..e06b80c62f 100644
--- a/server/src/com/vaadin/terminal/UIProvider.java
+++ b/server/src/com/vaadin/server/UIProvider.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
diff --git a/server/src/com/vaadin/terminal/UserError.java b/server/src/com/vaadin/server/UserError.java
index 18680f912f..756f2e70e0 100644
--- a/server/src/com/vaadin/terminal/UserError.java
+++ b/server/src/com/vaadin/server/UserError.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 /**
  * <code>UserError</code> is a controlled error occurred in application. User
diff --git a/server/src/com/vaadin/terminal/Vaadin6Component.java b/server/src/com/vaadin/server/Vaadin6Component.java
index eb169c90f9..00889df14a 100644
--- a/server/src/com/vaadin/terminal/Vaadin6Component.java
+++ b/server/src/com/vaadin/server/Vaadin6Component.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.util.EventListener;
 
diff --git a/server/src/com/vaadin/terminal/VariableOwner.java b/server/src/com/vaadin/server/VariableOwner.java
index faa0298311..4c6c86669c 100644
--- a/server/src/com/vaadin/terminal/VariableOwner.java
+++ b/server/src/com/vaadin/server/VariableOwner.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.util.Map;
diff --git a/server/src/com/vaadin/terminal/WrappedRequest.java b/server/src/com/vaadin/server/WrappedRequest.java
index 343a60848e..d012d572ea 100644
--- a/server/src/com/vaadin/terminal/WrappedRequest.java
+++ b/server/src/com/vaadin/server/WrappedRequest.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/server/src/com/vaadin/terminal/WrappedResponse.java b/server/src/com/vaadin/server/WrappedResponse.java
index 02daaa1bdd..c8d9342418 100644
--- a/server/src/com/vaadin/terminal/WrappedResponse.java
+++ b/server/src/com/vaadin/server/WrappedResponse.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/server/src/com/vaadin/terminal/package.html b/server/src/com/vaadin/server/package.html
index 83514a0de5..83514a0de5 100644
--- a/server/src/com/vaadin/terminal/package.html
+++ b/server/src/com/vaadin/server/package.html
diff --git a/server/src/com/vaadin/service/ApplicationContext.java b/server/src/com/vaadin/service/ApplicationContext.java
index 55495dcd5c..aaf5d1b386 100644
--- a/server/src/com/vaadin/service/ApplicationContext.java
+++ b/server/src/com/vaadin/service/ApplicationContext.java
@@ -22,7 +22,7 @@ import java.net.URL;
 import java.util.Collection;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ApplicationResource;
+import com.vaadin.server.ApplicationResource;
 import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
 
 /**
diff --git a/server/src/com/vaadin/service/FileTypeResolver.java b/server/src/com/vaadin/service/FileTypeResolver.java
index 2b289d6752..4b1c8697eb 100644
--- a/server/src/com/vaadin/service/FileTypeResolver.java
+++ b/server/src/com/vaadin/service/FileTypeResolver.java
@@ -23,8 +23,8 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 
 /**
  * Utility class that can figure out mime-types and icons related to files.
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
index 345f462239..47b9e97648 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
@@ -57,10 +57,10 @@ import com.vaadin.Application;
 import com.vaadin.Application.ApplicationStartEvent;
 import com.vaadin.Application.SystemMessages;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.Terminal;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.Terminal;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback;
 import com.vaadin.ui.UI;
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 13fd869166..c92dfddd3b 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -49,12 +49,12 @@ import javax.servlet.http.HttpSession;
 import com.vaadin.Application;
 import com.vaadin.Application.ApplicationStartEvent;
 import com.vaadin.Application.SystemMessages;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.Terminal;
+import com.vaadin.server.ThemeResource;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.Terminal;
-import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
 import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback;
 import com.vaadin.ui.UI;
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index 47923a1374..d4c1cfb157 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -66,6 +66,21 @@ import com.vaadin.annotations.StyleSheet;
 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
+import com.vaadin.server.AbstractClientConnector;
+import com.vaadin.server.CombinedRequest;
+import com.vaadin.server.LegacyPaint;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.StreamVariable;
+import com.vaadin.server.Vaadin6Component;
+import com.vaadin.server.VariableOwner;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
+import com.vaadin.server.StreamVariable.StreamingEndEvent;
+import com.vaadin.server.StreamVariable.StreamingErrorEvent;
+import com.vaadin.server.Terminal.ErrorEvent;
+import com.vaadin.server.Terminal.ErrorListener;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.JavaScriptConnectorState;
@@ -75,21 +90,6 @@ import com.vaadin.shared.communication.MethodInvocation;
 import com.vaadin.shared.communication.SharedState;
 import com.vaadin.shared.communication.UidlValue;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.AbstractClientConnector;
-import com.vaadin.terminal.CombinedRequest;
-import com.vaadin.terminal.LegacyPaint;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.StreamVariable;
-import com.vaadin.terminal.StreamVariable.StreamingEndEvent;
-import com.vaadin.terminal.StreamVariable.StreamingErrorEvent;
-import com.vaadin.terminal.Terminal.ErrorEvent;
-import com.vaadin.terminal.Terminal.ErrorListener;
-import com.vaadin.terminal.Vaadin6Component;
-import com.vaadin.terminal.VariableOwner;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
 import com.vaadin.terminal.gwt.server.BootstrapHandler.BootstrapContext;
 import com.vaadin.terminal.gwt.server.ComponentSizeValidator.InvalidLayout;
 import com.vaadin.terminal.gwt.server.RpcManager.RpcInvocationException;
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java b/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java
index 4052f5a400..ab85214d25 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java
@@ -22,7 +22,7 @@ import java.util.Properties;
 import java.util.ServiceLoader;
 import java.util.logging.Logger;
 
-import com.vaadin.terminal.DeploymentConfiguration;
+import com.vaadin.server.DeploymentConfiguration;
 
 public abstract class AbstractDeploymentConfiguration implements
         DeploymentConfiguration {
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java b/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java
index ec2aa84947..4ee309576b 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.terminal.gwt.server;
 
-import com.vaadin.terminal.StreamVariable.StreamingEvent;
+import com.vaadin.server.StreamVariable.StreamingEvent;
 
 /**
  * Abstract base class for StreamingEvent implementations.
diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
index d857eeef4a..29a2bcf72f 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
@@ -34,9 +34,9 @@ import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
 
 import com.vaadin.Application;
+import com.vaadin.server.ApplicationResource;
 import com.vaadin.service.ApplicationContext;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.ApplicationResource;
 
 /**
  * Base class for web application contexts (including portlet contexts) that
diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContext.java b/server/src/com/vaadin/terminal/gwt/server/AddonContext.java
index 2af22c560b..03f1d95a56 100644
--- a/server/src/com/vaadin/terminal/gwt/server/AddonContext.java
+++ b/server/src/com/vaadin/terminal/gwt/server/AddonContext.java
@@ -24,7 +24,7 @@ import java.util.ServiceLoader;
 
 import com.vaadin.Application;
 import com.vaadin.event.EventRouter;
-import com.vaadin.terminal.DeploymentConfiguration;
+import com.vaadin.server.DeploymentConfiguration;
 import com.vaadin.tools.ReflectTools;
 
 /**
diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java
index d5c0d604c3..397c8e7369 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java
@@ -23,11 +23,11 @@ import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletResponse;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ApplicationResource;
-import com.vaadin.terminal.DownloadStream;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
+import com.vaadin.server.ApplicationResource;
+import com.vaadin.server.DownloadStream;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 
 public class ApplicationResourceHandler implements RequestHandler {
     private static final Pattern APP_RESOURCE_PATTERN = Pattern
diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java b/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
index 857c7c738c..6765958369 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java
@@ -20,7 +20,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.DefaultUIProvider;
+import com.vaadin.server.DefaultUIProvider;
 import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException;
 
 /**
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java
index 6f69086523..ff26a1270a 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java
+++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java
@@ -21,7 +21,7 @@ import java.util.List;
 import org.jsoup.nodes.Node;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 
 /**
  * A representation of a bootstrap fragment being generated. The bootstrap
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
index 02005e8d22..94328b47bf 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
+++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
@@ -40,14 +40,14 @@ import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.Version;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
 import com.vaadin.ui.UI;
 
 public abstract class BootstrapHandler implements RequestHandler {
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java
index 847578ef97..1d244a69be 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java
+++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java
@@ -21,8 +21,8 @@ import java.util.Map;
 import org.jsoup.nodes.Document;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 
 /**
  * A representation of a bootstrap page being generated. The bootstrap page
diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java b/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java
index a422cba345..bc2fdb0dd2 100644
--- a/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java
+++ b/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java
@@ -20,7 +20,7 @@ import java.util.EventObject;
 
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java b/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java
index c2fbbe37d4..152acf9d2b 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java
@@ -20,10 +20,10 @@ import java.util.List;
 
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
+import com.vaadin.server.AbstractClientConnector;
+import com.vaadin.server.Extension;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.communication.SharedState;
-import com.vaadin.terminal.AbstractClientConnector;
-import com.vaadin.terminal.Extension;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.UI;
diff --git a/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
index 7551e849a1..93a2ede4ce 100644
--- a/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
+++ b/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
@@ -23,8 +23,8 @@ import javax.servlet.ServletContext;
 
 import com.vaadin.Application;
 import com.vaadin.external.json.JSONException;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java b/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
index 2349be1974..b8a116b1ad 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
@@ -28,7 +28,7 @@ import java.util.Vector;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.terminal.Sizeable.Unit;
+import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.AbstractSplitPanel;
 import com.vaadin.ui.Component;
diff --git a/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
index 0106f466fc..ff5cedd656 100644
--- a/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
+++ b/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
@@ -33,12 +33,12 @@ import com.vaadin.event.dd.TargetDetailsImpl;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
+import com.vaadin.server.Extension;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.VariableOwner;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.shared.communication.SharedState;
 import com.vaadin.shared.ui.dd.DragEventType;
-import com.vaadin.terminal.Extension;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.VariableOwner;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.UI;
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java b/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java
index 22467a0c1a..3b5eb9b42f 100644
--- a/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java
+++ b/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java
@@ -23,8 +23,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.vaadin.Application;
+import com.vaadin.server.Terminal;
 import com.vaadin.service.ApplicationContext.TransactionListener;
-import com.vaadin.terminal.Terminal;
 
 /**
  * {@link Application} that implements this interface gets notified of request
diff --git a/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
index cfc3cc7e7e..e7efd28a9c 100644
--- a/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
+++ b/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
@@ -27,11 +27,11 @@ import java.util.Stack;
 import java.util.Vector;
 import java.util.logging.Logger;
 
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.StreamVariable;
-import com.vaadin.terminal.VariableOwner;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.StreamVariable;
+import com.vaadin.server.VariableOwner;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CustomLayout;
@@ -589,7 +589,7 @@ public class JsonPaintTarget implements PaintTarget {
      * @throws PaintException
      *             if the paint operation failed.
      * 
-     * @see com.vaadin.terminal.PaintTarget#addXMLSection(String, String,
+     * @see com.vaadin.server.PaintTarget#addXMLSection(String, String,
      *      String)
      */
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
index 3e0f8d6b99..b10e661fb3 100644
--- a/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
+++ b/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
@@ -45,7 +45,7 @@ import javax.servlet.http.HttpSessionBindingListener;
 import javax.xml.namespace.QName;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ExternalResource;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java b/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java
index e127425786..a2aa446ac7 100644
--- a/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java
+++ b/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java
@@ -29,11 +29,11 @@ import javax.portlet.ResourceURL;
 import com.vaadin.Application;
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
 import com.vaadin.ui.UI;
 
 /**
diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java b/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java
index f7b6421e11..5647606a75 100644
--- a/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java
+++ b/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java
@@ -22,8 +22,8 @@ import javax.portlet.PortletResponse;
 import javax.servlet.Filter;
 
 import com.vaadin.Application;
+import com.vaadin.server.Terminal;
 import com.vaadin.service.ApplicationContext.TransactionListener;
-import com.vaadin.terminal.Terminal;
 
 /**
  * An {@link Application} that implements this interface gets notified of
diff --git a/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java b/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java
index a1d5731f7d..98aa61a885 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java
@@ -16,11 +16,11 @@
 package com.vaadin.terminal.gwt.server;
 
 import com.vaadin.Application;
+import com.vaadin.server.ApplicationResource;
+import com.vaadin.server.ExternalResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
 import com.vaadin.shared.communication.URLReference;
-import com.vaadin.terminal.ApplicationResource;
-import com.vaadin.terminal.ExternalResource;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
 
 public class ResourceReference extends URLReference {
 
diff --git a/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java b/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java
index 1a3cf28fcc..0bdb141b6f 100644
--- a/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java
+++ b/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java
@@ -18,7 +18,7 @@ package com.vaadin.terminal.gwt.server;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.VariableOwner;
+import com.vaadin.server.VariableOwner;
 
 /**
  * Marker interface for server side classes that can receive RPC calls.
diff --git a/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java b/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java
index 1d35785a57..cb95eada22 100644
--- a/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java
+++ b/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java
@@ -3,9 +3,9 @@ package com.vaadin.terminal.gwt.server;
 import java.io.Serializable;
 
 import com.vaadin.Application;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /*
diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java
index 6bc9f8fbd9..a484705ca5 100644
--- a/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java
+++ b/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.terminal.gwt.server;
 
-import com.vaadin.terminal.StreamVariable.StreamingEndEvent;
+import com.vaadin.server.StreamVariable.StreamingEndEvent;
 
 @SuppressWarnings("serial")
 final class StreamingEndEventImpl extends AbstractStreamingEvent implements
diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java
index cf9339d676..8e794b5fbf 100644
--- a/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java
+++ b/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.terminal.gwt.server;
 
-import com.vaadin.terminal.StreamVariable.StreamingErrorEvent;
+import com.vaadin.server.StreamVariable.StreamingErrorEvent;
 
 @SuppressWarnings("serial")
 final class StreamingErrorEventImpl extends AbstractStreamingEvent implements
diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java
index bcb114db60..14d0ed4f3a 100644
--- a/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java
+++ b/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.terminal.gwt.server;
 
-import com.vaadin.terminal.StreamVariable.StreamingProgressEvent;
+import com.vaadin.server.StreamVariable.StreamingProgressEvent;
 
 @SuppressWarnings("serial")
 final class StreamingProgressEventImpl extends AbstractStreamingEvent implements
diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java b/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java
index 07ff6cf7b1..51c286549d 100644
--- a/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java
+++ b/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.terminal.gwt.server;
 
-import com.vaadin.terminal.StreamVariable.StreamingStartEvent;
+import com.vaadin.server.StreamVariable.StreamingStartEvent;
 
 @SuppressWarnings("serial")
 final class StreamingStartEventImpl extends AbstractStreamingEvent implements
diff --git a/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java b/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java
index 22e46cb722..b30133191d 100644
--- a/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java
+++ b/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java
@@ -19,9 +19,9 @@ import java.io.IOException;
 import java.io.Writer;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 
 /**
  * A {@link RequestHandler} that presents an informative page if the browser in
diff --git a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java
index 37bc81cfcf..25193b5cbe 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java
+++ b/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java
@@ -19,8 +19,8 @@ package com.vaadin.terminal.gwt.server;
 import java.util.Date;
 import java.util.Locale;
 
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.shared.VBrowserDetails;
-import com.vaadin.terminal.WrappedRequest;
 
 /**
  * Class that provides information about the web browser the user is using.
diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
index a64be4c163..6b69a125a2 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
+++ b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java
@@ -20,9 +20,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.CombinedRequest;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.CombinedRequest;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.WrappedRequest;
 
 /**
  * Wrapper for {@link HttpServletRequest}.
diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java
index 237bb643ee..c2e8ed1416 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java
+++ b/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java
@@ -19,8 +19,8 @@ package com.vaadin.terminal.gwt.server;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedResponse;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.WrappedResponse;
 
 /**
  * Wrapper for {@link HttpServletResponse}.
diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java
index 9ac2e5a608..80d6f9571e 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java
+++ b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java
@@ -26,10 +26,10 @@ import javax.portlet.PortletRequest;
 import javax.portlet.ResourceRequest;
 
 import com.vaadin.Application;
+import com.vaadin.server.CombinedRequest;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.CombinedRequest;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedRequest;
 
 /**
  * Wrapper for {@link PortletRequest} and its subclasses.
diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java
index 39ccacd331..584c304eaa 100644
--- a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java
+++ b/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java
@@ -29,8 +29,8 @@ import javax.portlet.MimeResponse;
 import javax.portlet.PortletResponse;
 import javax.portlet.ResourceResponse;
 
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedResponse;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.WrappedResponse;
 
 /**
  * Wrapper for {@link PortletResponse} and its subclasses.
diff --git a/server/src/com/vaadin/ui/AbsoluteLayout.java b/server/src/com/vaadin/ui/AbsoluteLayout.java
index 56bbd19852..412a3390e4 100644
--- a/server/src/com/vaadin/ui/AbsoluteLayout.java
+++ b/server/src/com/vaadin/ui/AbsoluteLayout.java
@@ -24,12 +24,12 @@ import java.util.Map;
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.event.LayoutEvents.LayoutClickNotifier;
+import com.vaadin.server.Sizeable;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutServerRpc;
 import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutState;
-import com.vaadin.terminal.Sizeable;
 
 /**
  * AbsoluteLayout is a layout implementation that mimics html absolute
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 33ba80656d..d651755a2a 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -32,11 +32,11 @@ import com.vaadin.event.ActionManager;
 import com.vaadin.event.EventRouter;
 import com.vaadin.event.MethodEventSource;
 import com.vaadin.event.ShortcutListener;
+import com.vaadin.server.AbstractClientConnector;
+import com.vaadin.server.ErrorMessage;
+import com.vaadin.server.Resource;
+import com.vaadin.server.Terminal;
 import com.vaadin.shared.ComponentState;
-import com.vaadin.terminal.AbstractClientConnector;
-import com.vaadin.terminal.ErrorMessage;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Terminal;
 import com.vaadin.terminal.gwt.server.ClientConnector;
 import com.vaadin.terminal.gwt.server.ComponentSizeValidator;
 import com.vaadin.terminal.gwt.server.ResourceReference;
@@ -1072,7 +1072,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#getHeight()
+     * @see com.vaadin.Sizeable#getHeight()
      */
     @Override
     public float getHeight() {
@@ -1082,7 +1082,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#getHeightUnits()
+     * @see com.vaadin.server.Sizeable#getHeightUnits()
      */
     @Override
     public Unit getHeightUnits() {
@@ -1092,7 +1092,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#getWidth()
+     * @see com.vaadin.server.Sizeable#getWidth()
      */
     @Override
     public float getWidth() {
@@ -1102,7 +1102,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#getWidthUnits()
+     * @see com.vaadin.server.Sizeable#getWidthUnits()
      */
     @Override
     public Unit getWidthUnits() {
@@ -1112,7 +1112,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setHeight(float, Unit)
+     * @see com.vaadin.server.Sizeable#setHeight(float, Unit)
      */
     @Override
     public void setHeight(float height, Unit unit) {
@@ -1128,7 +1128,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setSizeFull()
+     * @see com.vaadin.server.Sizeable#setSizeFull()
      */
     @Override
     public void setSizeFull() {
@@ -1139,7 +1139,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setSizeUndefined()
+     * @see com.vaadin.server.Sizeable#setSizeUndefined()
      */
     @Override
     public void setSizeUndefined() {
@@ -1150,7 +1150,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setWidth(float, Unit)
+     * @see com.vaadin.server.Sizeable#setWidth(float, Unit)
      */
     @Override
     public void setWidth(float width, Unit unit) {
@@ -1166,7 +1166,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setWidth(java.lang.String)
+     * @see com.vaadin.server.Sizeable#setWidth(java.lang.String)
      */
     @Override
     public void setWidth(String width) {
@@ -1181,7 +1181,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setHeight(java.lang.String)
+     * @see com.vaadin.server.Sizeable#setHeight(java.lang.String)
      */
     @Override
     public void setHeight(String height) {
diff --git a/server/src/com/vaadin/ui/AbstractEmbedded.java b/server/src/com/vaadin/ui/AbstractEmbedded.java
index 9396af5c44..de44c89656 100644
--- a/server/src/com/vaadin/ui/AbstractEmbedded.java
+++ b/server/src/com/vaadin/ui/AbstractEmbedded.java
@@ -4,8 +4,8 @@
 
 package com.vaadin.ui;
 
+import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
-import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.gwt.server.ResourceReference;
 
 /**
diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java
index 5123d08da9..eaedfa5809 100644
--- a/server/src/com/vaadin/ui/AbstractField.java
+++ b/server/src/com/vaadin/ui/AbstractField.java
@@ -37,10 +37,10 @@ import com.vaadin.data.util.converter.ConverterUtil;
 import com.vaadin.event.Action;
 import com.vaadin.event.ShortcutAction;
 import com.vaadin.event.ShortcutListener;
+import com.vaadin.server.AbstractErrorMessage;
+import com.vaadin.server.CompositeErrorMessage;
+import com.vaadin.server.ErrorMessage;
 import com.vaadin.shared.AbstractFieldState;
-import com.vaadin.terminal.AbstractErrorMessage;
-import com.vaadin.terminal.CompositeErrorMessage;
-import com.vaadin.terminal.ErrorMessage;
 
 /**
  * <p>
diff --git a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
index bd5735144e..3b80ac1f68 100644
--- a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
+++ b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java
@@ -15,8 +15,8 @@
  */
 package com.vaadin.ui;
 
+import com.vaadin.server.JavaScriptCallbackHelper;
 import com.vaadin.shared.ui.JavaScriptComponentState;
-import com.vaadin.terminal.JavaScriptCallbackHelper;
 
 /**
  * Base class for Components with all client-side logic implemented using
diff --git a/server/src/com/vaadin/ui/AbstractMedia.java b/server/src/com/vaadin/ui/AbstractMedia.java
index 77c12ac045..f26fe714b9 100644
--- a/server/src/com/vaadin/ui/AbstractMedia.java
+++ b/server/src/com/vaadin/ui/AbstractMedia.java
@@ -19,10 +19,10 @@ package com.vaadin.ui;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.vaadin.server.Resource;
 import com.vaadin.shared.communication.URLReference;
 import com.vaadin.shared.ui.AbstractMediaState;
 import com.vaadin.shared.ui.MediaControl;
-import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.gwt.server.ResourceReference;
 
 /**
diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
index 596bbb7ee2..53572097e0 100644
--- a/server/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -22,6 +22,7 @@ import java.util.LinkedList;
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.event.LayoutEvents.LayoutClickNotifier;
+import com.vaadin.server.Sizeable;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
@@ -29,7 +30,6 @@ import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutServerRpc;
 import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState;
 import com.vaadin.shared.ui.orderedlayout.AbstractOrderedLayoutState.ChildComponentData;
-import com.vaadin.terminal.Sizeable;
 
 @SuppressWarnings("serial")
 public abstract class AbstractOrderedLayout extends AbstractLayout implements
diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java
index 21ff7ba948..05169552d7 100644
--- a/server/src/com/vaadin/ui/AbstractSelect.java
+++ b/server/src/com/vaadin/ui/AbstractSelect.java
@@ -39,12 +39,12 @@ import com.vaadin.event.dd.TargetDetailsImpl;
 import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion;
 import com.vaadin.event.dd.acceptcriteria.ContainsDataFlavor;
 import com.vaadin.event.dd.acceptcriteria.TargetDetailIs;
+import com.vaadin.server.KeyMapper;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
-import com.vaadin.terminal.KeyMapper;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
 
 /**
diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java
index 8b7499115c..f9fea66276 100644
--- a/server/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java
@@ -22,12 +22,12 @@ import java.util.Iterator;
 
 import com.vaadin.event.ComponentEventListener;
 import com.vaadin.event.MouseEvents.ClickEvent;
+import com.vaadin.server.Sizeable;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelRpc;
 import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState;
 import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState.SplitterState;
-import com.vaadin.terminal.Sizeable;
 import com.vaadin.tools.ReflectTools;
 
 /**
diff --git a/server/src/com/vaadin/ui/AbstractTextField.java b/server/src/com/vaadin/ui/AbstractTextField.java
index 1bd61023a4..94a32dac96 100644
--- a/server/src/com/vaadin/ui/AbstractTextField.java
+++ b/server/src/com/vaadin/ui/AbstractTextField.java
@@ -27,11 +27,11 @@ import com.vaadin.event.FieldEvents.FocusNotifier;
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
 import com.vaadin.event.FieldEvents.TextChangeNotifier;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.ui.textfield.AbstractTextFieldState;
 import com.vaadin.shared.ui.textfield.TextFieldConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
 
 public abstract class AbstractTextField extends AbstractField<String> implements
         BlurNotifier, FocusNotifier, TextChangeNotifier, Vaadin6Component {
diff --git a/server/src/com/vaadin/ui/Audio.java b/server/src/com/vaadin/ui/Audio.java
index 03ed7ba6d5..d111c0c74c 100644
--- a/server/src/com/vaadin/ui/Audio.java
+++ b/server/src/com/vaadin/ui/Audio.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.ui;
 
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.Resource;
 
 /**
  * The Audio component translates into an HTML5 &lt;audio&gt; element and as
diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java
index af19ca5b96..9cc4caa7c3 100644
--- a/server/src/com/vaadin/ui/ComboBox.java
+++ b/server/src/com/vaadin/ui/ComboBox.java
@@ -19,9 +19,9 @@ package com.vaadin.ui;
 import java.util.Collection;
 
 import com.vaadin.data.Container;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.combobox.ComboBoxConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
 
 /**
  * A filtering dropdown single-select. Suitable for newItemsAllowed, but it's
diff --git a/server/src/com/vaadin/ui/Component.java b/server/src/com/vaadin/ui/Component.java
index f0993aac6d..5f9a093366 100644
--- a/server/src/com/vaadin/ui/Component.java
+++ b/server/src/com/vaadin/ui/Component.java
@@ -23,10 +23,10 @@ import java.util.Locale;
 
 import com.vaadin.Application;
 import com.vaadin.event.FieldEvents;
-import com.vaadin.terminal.ErrorMessage;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Sizeable;
-import com.vaadin.terminal.VariableOwner;
+import com.vaadin.server.ErrorMessage;
+import com.vaadin.server.Resource;
+import com.vaadin.server.Sizeable;
+import com.vaadin.server.VariableOwner;
 import com.vaadin.terminal.gwt.server.ClientConnector;
 
 /**
@@ -463,7 +463,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * 
      * <p>
      * The image is loaded by the browser from a resource, typically a
-     * {@link com.vaadin.terminal.ThemeResource}.
+     * {@link com.vaadin.server.ThemeResource}.
      * </p>
      * 
      * <pre>
diff --git a/server/src/com/vaadin/ui/ConnectorTracker.java b/server/src/com/vaadin/ui/ConnectorTracker.java
index ad62b90211..e8f7b5e8c7 100644
--- a/server/src/com/vaadin/ui/ConnectorTracker.java
+++ b/server/src/com/vaadin/ui/ConnectorTracker.java
@@ -25,7 +25,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.terminal.AbstractClientConnector;
+import com.vaadin.server.AbstractClientConnector;
 import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
 import com.vaadin.terminal.gwt.server.ClientConnector;
 
diff --git a/server/src/com/vaadin/ui/CustomLayout.java b/server/src/com/vaadin/ui/CustomLayout.java
index 54308b99c3..cf64af85ca 100644
--- a/server/src/com/vaadin/ui/CustomLayout.java
+++ b/server/src/com/vaadin/ui/CustomLayout.java
@@ -24,10 +24,10 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.ui.customlayout.CustomLayoutState;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.server.JsonPaintTarget;
 
 /**
diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java
index 828fa3b21d..b4bf93b5b0 100644
--- a/server/src/com/vaadin/ui/DateField.java
+++ b/server/src/com/vaadin/ui/DateField.java
@@ -36,10 +36,10 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.ui.datefield.DateFieldConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * <p>
diff --git a/server/src/com/vaadin/ui/DragAndDropWrapper.java b/server/src/com/vaadin/ui/DragAndDropWrapper.java
index ec805ecf46..fcd0b95015 100644
--- a/server/src/com/vaadin/ui/DragAndDropWrapper.java
+++ b/server/src/com/vaadin/ui/DragAndDropWrapper.java
@@ -29,14 +29,14 @@ import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.DropTarget;
 import com.vaadin.event.dd.TargetDetails;
 import com.vaadin.event.dd.TargetDetailsImpl;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.StreamVariable;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.dd.HorizontalDropLocation;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.shared.ui.draganddropwrapper.DragAndDropWrapperConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.StreamVariable;
-import com.vaadin.terminal.Vaadin6Component;
 
 @SuppressWarnings("serial")
 public class DragAndDropWrapper extends CustomComponent implements DropTarget,
diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java
index 41b93d0b27..a8663abd32 100644
--- a/server/src/com/vaadin/ui/Embedded.java
+++ b/server/src/com/vaadin/ui/Embedded.java
@@ -22,14 +22,14 @@ import java.util.Map;
 
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.embedded.EmbeddedConstants;
 import com.vaadin.shared.ui.embedded.EmbeddedServerRpc;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * Component for embedding external objects.
diff --git a/server/src/com/vaadin/ui/Form.java b/server/src/com/vaadin/ui/Form.java
index 55404b2e6b..8bf46ed198 100644
--- a/server/src/com/vaadin/ui/Form.java
+++ b/server/src/com/vaadin/ui/Form.java
@@ -36,14 +36,14 @@ import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.Action.ShortcutNotifier;
 import com.vaadin.event.ActionManager;
+import com.vaadin.server.AbstractErrorMessage;
+import com.vaadin.server.CompositeErrorMessage;
+import com.vaadin.server.ErrorMessage;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.UserError;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.ui.form.FormState;
-import com.vaadin.terminal.AbstractErrorMessage;
-import com.vaadin.terminal.CompositeErrorMessage;
-import com.vaadin.terminal.ErrorMessage;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.UserError;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * Form component provides easy way of creating and managing sets fields.
diff --git a/server/src/com/vaadin/ui/GridLayout.java b/server/src/com/vaadin/ui/GridLayout.java
index 3870b71611..27a25699ba 100644
--- a/server/src/com/vaadin/ui/GridLayout.java
+++ b/server/src/com/vaadin/ui/GridLayout.java
@@ -27,16 +27,16 @@ import java.util.Map.Entry;
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.event.LayoutEvents.LayoutClickNotifier;
+import com.vaadin.server.LegacyPaint;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.gridlayout.GridLayoutServerRpc;
 import com.vaadin.shared.ui.gridlayout.GridLayoutState;
-import com.vaadin.terminal.LegacyPaint;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * A layout where the components are laid out on a grid using cell coordinates.
diff --git a/server/src/com/vaadin/ui/Html5File.java b/server/src/com/vaadin/ui/Html5File.java
index 596f83a1d8..47af708160 100644
--- a/server/src/com/vaadin/ui/Html5File.java
+++ b/server/src/com/vaadin/ui/Html5File.java
@@ -18,7 +18,7 @@ package com.vaadin.ui;
 import java.io.Serializable;
 
 import com.vaadin.event.dd.DropHandler;
-import com.vaadin.terminal.StreamVariable;
+import com.vaadin.server.StreamVariable;
 
 /**
  * {@link DragAndDropWrapper} can receive also files from client computer if
diff --git a/server/src/com/vaadin/ui/Image.java b/server/src/com/vaadin/ui/Image.java
index b0dbc9e629..8e43d88b37 100644
--- a/server/src/com/vaadin/ui/Image.java
+++ b/server/src/com/vaadin/ui/Image.java
@@ -6,11 +6,11 @@ package com.vaadin.ui;
 
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.image.ImageServerRpc;
 import com.vaadin.shared.ui.image.ImageState;
-import com.vaadin.terminal.Resource;
 
 /**
  * Component for embedding images.
diff --git a/server/src/com/vaadin/ui/JavaScript.java b/server/src/com/vaadin/ui/JavaScript.java
index e34ccae82a..f3e8564fab 100644
--- a/server/src/com/vaadin/ui/JavaScript.java
+++ b/server/src/com/vaadin/ui/JavaScript.java
@@ -21,11 +21,11 @@ import java.util.Map;
 
 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
+import com.vaadin.server.AbstractExtension;
+import com.vaadin.server.Page;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.shared.extension.javascriptmanager.ExecuteJavaScriptRpc;
 import com.vaadin.shared.extension.javascriptmanager.JavaScriptManagerState;
-import com.vaadin.terminal.AbstractExtension;
-import com.vaadin.terminal.Page;
 
 /**
  * Provides access to JavaScript functionality in the web browser. To get an
diff --git a/server/src/com/vaadin/ui/JavaScriptFunction.java b/server/src/com/vaadin/ui/JavaScriptFunction.java
index 3a17fef995..ebb5e2c073 100644
--- a/server/src/com/vaadin/ui/JavaScriptFunction.java
+++ b/server/src/com/vaadin/ui/JavaScriptFunction.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 
 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
-import com.vaadin.terminal.AbstractJavaScriptExtension;
+import com.vaadin.server.AbstractJavaScriptExtension;
 
 /**
  * Defines a method that is called by a client-side JavaScript function. When
diff --git a/server/src/com/vaadin/ui/Link.java b/server/src/com/vaadin/ui/Link.java
index f98a2b0d2d..cb6b643c33 100644
--- a/server/src/com/vaadin/ui/Link.java
+++ b/server/src/com/vaadin/ui/Link.java
@@ -18,11 +18,11 @@ package com.vaadin.ui;
 
 import java.util.Map;
 
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.ui.BorderStyle;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * Link is used to create external or internal URL links.
diff --git a/server/src/com/vaadin/ui/ListSelect.java b/server/src/com/vaadin/ui/ListSelect.java
index da78e24fa8..90e1c16a4d 100644
--- a/server/src/com/vaadin/ui/ListSelect.java
+++ b/server/src/com/vaadin/ui/ListSelect.java
@@ -19,8 +19,8 @@ package com.vaadin.ui;
 import java.util.Collection;
 
 import com.vaadin.data.Container;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * This is a simple list select without, for instance, support for new items,
diff --git a/server/src/com/vaadin/ui/LoginForm.java b/server/src/com/vaadin/ui/LoginForm.java
index 1c154699d8..7715f08a6e 100644
--- a/server/src/com/vaadin/ui/LoginForm.java
+++ b/server/src/com/vaadin/ui/LoginForm.java
@@ -25,12 +25,12 @@ import java.util.Iterator;
 import java.util.Map;
 
 import com.vaadin.Application;
+import com.vaadin.server.ApplicationResource;
+import com.vaadin.server.DownloadStream;
+import com.vaadin.server.RequestHandler;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.WrappedResponse;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.ApplicationResource;
-import com.vaadin.terminal.DownloadStream;
-import com.vaadin.terminal.RequestHandler;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedResponse;
 
 /**
  * LoginForm is a Vaadin component to handle common problem among Ajax
diff --git a/server/src/com/vaadin/ui/MenuBar.java b/server/src/com/vaadin/ui/MenuBar.java
index 51c06cf934..4414bef9aa 100644
--- a/server/src/com/vaadin/ui/MenuBar.java
+++ b/server/src/com/vaadin/ui/MenuBar.java
@@ -22,11 +22,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.ui.menubar.MenuBarConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * <p>
diff --git a/server/src/com/vaadin/ui/NativeSelect.java b/server/src/com/vaadin/ui/NativeSelect.java
index c2969874b0..8006813276 100644
--- a/server/src/com/vaadin/ui/NativeSelect.java
+++ b/server/src/com/vaadin/ui/NativeSelect.java
@@ -19,8 +19,8 @@ package com.vaadin.ui;
 import java.util.Collection;
 
 import com.vaadin.data.Container;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * This is a simple drop-down select without, for instance, support for
diff --git a/server/src/com/vaadin/ui/Notification.java b/server/src/com/vaadin/ui/Notification.java
index 22ad31dffe..758d2c86a3 100644
--- a/server/src/com/vaadin/ui/Notification.java
+++ b/server/src/com/vaadin/ui/Notification.java
@@ -18,9 +18,9 @@ package com.vaadin.ui;
 
 import java.io.Serializable;
 
+import com.vaadin.server.Page;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.Position;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Resource;
 
 /**
  * A notification message, used to display temporary messages to the user - for
diff --git a/server/src/com/vaadin/ui/OptionGroup.java b/server/src/com/vaadin/ui/OptionGroup.java
index 12507442c9..8846ec36e3 100644
--- a/server/src/com/vaadin/ui/OptionGroup.java
+++ b/server/src/com/vaadin/ui/OptionGroup.java
@@ -27,9 +27,9 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.optiongroup.OptionGroupConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
 
 /**
  * Configures select to be used as an option group.
diff --git a/server/src/com/vaadin/ui/Panel.java b/server/src/com/vaadin/ui/Panel.java
index 00810b83db..d076e4d612 100644
--- a/server/src/com/vaadin/ui/Panel.java
+++ b/server/src/com/vaadin/ui/Panel.java
@@ -25,14 +25,14 @@ import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ActionManager;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Scrollable;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.panel.PanelServerRpc;
 import com.vaadin.shared.ui.panel.PanelState;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Scrollable;
-import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.ui.Component.Focusable;
 
 /**
@@ -195,8 +195,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.terminal.Vaadin6Component#paintContent(com.vaadin.terminal
+     * @see com.vaadin.server.Vaadin6Component#paintContent(com.vaadin.server
      * .PaintTarget)
      */
     @Override
@@ -250,7 +249,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * Called when one or more variables handled by the implementing class are
      * changed.
      * 
-     * @see com.vaadin.terminal.VariableOwner#changeVariables(Object, Map)
+     * @see com.vaadin.server.VariableOwner#changeVariables(Object, Map)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -289,7 +288,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Scrollable#setScrollable(boolean)
+     * @see com.vaadin.server.Scrollable#setScrollable(boolean)
      */
     @Override
     public int getScrollLeft() {
@@ -299,7 +298,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Scrollable#setScrollable(boolean)
+     * @see com.vaadin.server.Scrollable#setScrollable(boolean)
      */
     @Override
     public int getScrollTop() {
@@ -309,7 +308,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Scrollable#setScrollLeft(int)
+     * @see com.vaadin.server.Scrollable#setScrollLeft(int)
      */
     @Override
     public void setScrollLeft(int scrollLeft) {
@@ -323,7 +322,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Scrollable#setScrollTop(int)
+     * @see com.vaadin.server.Scrollable#setScrollTop(int)
      */
     @Override
     public void setScrollTop(int scrollTop) {
diff --git a/server/src/com/vaadin/ui/PopupDateField.java b/server/src/com/vaadin/ui/PopupDateField.java
index acff49a142..39e0578301 100644
--- a/server/src/com/vaadin/ui/PopupDateField.java
+++ b/server/src/com/vaadin/ui/PopupDateField.java
@@ -19,8 +19,8 @@ package com.vaadin.ui;
 import java.util.Date;
 
 import com.vaadin.data.Property;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 
 /**
  * <p>
diff --git a/server/src/com/vaadin/ui/PopupView.java b/server/src/com/vaadin/ui/PopupView.java
index 786257c240..a4832a013f 100644
--- a/server/src/com/vaadin/ui/PopupView.java
+++ b/server/src/com/vaadin/ui/PopupView.java
@@ -20,10 +20,10 @@ import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.Map;
 
-import com.vaadin.terminal.LegacyPaint;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
+import com.vaadin.server.LegacyPaint;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Vaadin6Component;
 
 /**
  * 
@@ -309,7 +309,7 @@ public class PopupView extends AbstractComponentContainer implements
     /**
      * Paint (serialize) the component for the client.
      * 
-     * @see com.vaadin.ui.AbstractComponent#paintContent(com.vaadin.terminal.PaintTarget)
+     * @see com.vaadin.ui.AbstractComponent#paintContent(com.vaadin.server.PaintTarget)
      */
     @Override
     public void paintContent(PaintTarget target) throws PaintException {
diff --git a/server/src/com/vaadin/ui/ProgressIndicator.java b/server/src/com/vaadin/ui/ProgressIndicator.java
index 528c404ab9..4ad441a949 100644
--- a/server/src/com/vaadin/ui/ProgressIndicator.java
+++ b/server/src/com/vaadin/ui/ProgressIndicator.java
@@ -20,9 +20,9 @@ import java.util.Map;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Vaadin6Component;
 
 /**
  * <code>ProgressIndicator</code> is component that shows user state of a
diff --git a/server/src/com/vaadin/ui/RichTextArea.java b/server/src/com/vaadin/ui/RichTextArea.java
index 51caa82136..e2beace1be 100644
--- a/server/src/com/vaadin/ui/RichTextArea.java
+++ b/server/src/com/vaadin/ui/RichTextArea.java
@@ -19,9 +19,9 @@ package com.vaadin.ui;
 import java.util.Map;
 
 import com.vaadin.data.Property;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Vaadin6Component;
 
 /**
  * A simple RichTextArea to edit HTML format text.
diff --git a/server/src/com/vaadin/ui/Select.java b/server/src/com/vaadin/ui/Select.java
index 6ff7c9c9bc..c7688df7e8 100644
--- a/server/src/com/vaadin/ui/Select.java
+++ b/server/src/com/vaadin/ui/Select.java
@@ -32,9 +32,9 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
 
 /**
  * <p>
diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java
index 82faedcc41..f84e6f52ad 100644
--- a/server/src/com/vaadin/ui/TabSheet.java
+++ b/server/src/com/vaadin/ui/TabSheet.java
@@ -30,15 +30,15 @@ import com.vaadin.event.FieldEvents.BlurNotifier;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.event.FieldEvents.FocusNotifier;
+import com.vaadin.server.ErrorMessage;
+import com.vaadin.server.KeyMapper;
+import com.vaadin.server.LegacyPaint;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants;
 import com.vaadin.shared.ui.tabsheet.TabsheetConstants;
-import com.vaadin.terminal.ErrorMessage;
-import com.vaadin.terminal.KeyMapper;
-import com.vaadin.terminal.LegacyPaint;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.ui.Component.Focusable;
 import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.ui.themes.Runo;
diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index 8fc3fc2572..118e3b3fcf 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -52,13 +52,13 @@ import com.vaadin.event.dd.DragSource;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.DropTarget;
 import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion;
+import com.vaadin.server.KeyMapper;
+import com.vaadin.server.LegacyPaint;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.table.TableConstants;
-import com.vaadin.terminal.KeyMapper;
-import com.vaadin.terminal.LegacyPaint;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
 
 /**
  * <p>
@@ -4759,7 +4759,7 @@ public class Table extends AbstractSelect implements Action.Container,
          * 
          * @see
          * com.vaadin.event.dd.acceptcriteria.AcceptCriterion#paintResponse(
-         * com.vaadin.terminal.PaintTarget)
+         * com.vaadin.server.PaintTarget)
          */
 
         @Override
diff --git a/server/src/com/vaadin/ui/Tree.java b/server/src/com/vaadin/ui/Tree.java
index 2d6673a67d..529847d54c 100644
--- a/server/src/com/vaadin/ui/Tree.java
+++ b/server/src/com/vaadin/ui/Tree.java
@@ -49,13 +49,13 @@ import com.vaadin.event.dd.TargetDetails;
 import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion;
 import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion;
 import com.vaadin.event.dd.acceptcriteria.TargetDetailIs;
+import com.vaadin.server.KeyMapper;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.shared.ui.tree.TreeConstants;
-import com.vaadin.terminal.KeyMapper;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
 import com.vaadin.tools.ReflectTools;
 
 /**
@@ -1449,7 +1449,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
          * 
          * @see
          * com.vaadin.event.dd.acceptCriteria.AcceptCriterion#paintResponse(
-         * com.vaadin.terminal.PaintTarget)
+         * com.vaadin.server.PaintTarget)
          */
         @Override
         public void paintResponse(PaintTarget target) throws PaintException {
diff --git a/server/src/com/vaadin/ui/TreeTable.java b/server/src/com/vaadin/ui/TreeTable.java
index 05757a6d09..dd79461f37 100644
--- a/server/src/com/vaadin/ui/TreeTable.java
+++ b/server/src/com/vaadin/ui/TreeTable.java
@@ -32,10 +32,10 @@ import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.util.ContainerHierarchicalWrapper;
 import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.data.util.HierarchicalContainerOrderedWrapper;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.treetable.TreeTableConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
 import com.vaadin.ui.Tree.CollapseEvent;
 import com.vaadin.ui.Tree.CollapseListener;
 import com.vaadin.ui.Tree.ExpandEvent;
diff --git a/server/src/com/vaadin/ui/TwinColSelect.java b/server/src/com/vaadin/ui/TwinColSelect.java
index 891e695a5f..76f1e1e8c7 100644
--- a/server/src/com/vaadin/ui/TwinColSelect.java
+++ b/server/src/com/vaadin/ui/TwinColSelect.java
@@ -19,9 +19,9 @@ package com.vaadin.ui;
 import java.util.Collection;
 
 import com.vaadin.data.Container;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
 
 /**
  * Multiselect component with two lists: left side for available items and right
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 17a028bcdf..4731ebffe6 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -34,21 +34,21 @@ import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ActionManager;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
+import com.vaadin.server.Page;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Resource;
+import com.vaadin.server.Vaadin6Component;
+import com.vaadin.server.WrappedRequest;
+import com.vaadin.server.Page.BrowserWindowResizeEvent;
+import com.vaadin.server.Page.BrowserWindowResizeListener;
+import com.vaadin.server.WrappedRequest.BrowserDetails;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.BorderStyle;
 import com.vaadin.shared.ui.ui.UIConstants;
 import com.vaadin.shared.ui.ui.UIServerRpc;
 import com.vaadin.shared.ui.ui.UIState;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Page.BrowserWindowResizeEvent;
-import com.vaadin.terminal.Page.BrowserWindowResizeListener;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.Vaadin6Component;
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.terminal.WrappedRequest.BrowserDetails;
 import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
 import com.vaadin.tools.ReflectTools;
 
diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java
index 619db07eea..683b9ce478 100644
--- a/server/src/com/vaadin/ui/Upload.java
+++ b/server/src/com/vaadin/ui/Upload.java
@@ -24,10 +24,10 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.StreamVariable.StreamingProgressEvent;
-import com.vaadin.terminal.Vaadin6Component;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Vaadin6Component;
+import com.vaadin.server.StreamVariable.StreamingProgressEvent;
 import com.vaadin.terminal.gwt.server.NoInputStreamException;
 import com.vaadin.terminal.gwt.server.NoOutputStreamException;
 
@@ -936,11 +936,11 @@ public class Upload extends AbstractComponent implements Component.Focusable,
      * Handle to terminal via Upload monitors and controls the upload during it
      * is being streamed.
      */
-    private com.vaadin.terminal.StreamVariable streamVariable;
+    private com.vaadin.server.StreamVariable streamVariable;
 
-    protected com.vaadin.terminal.StreamVariable getStreamVariable() {
+    protected com.vaadin.server.StreamVariable getStreamVariable() {
         if (streamVariable == null) {
-            streamVariable = new com.vaadin.terminal.StreamVariable() {
+            streamVariable = new com.vaadin.server.StreamVariable() {
                 private StreamingStartEvent lastStartedEvent;
 
                 @Override
diff --git a/server/src/com/vaadin/ui/Video.java b/server/src/com/vaadin/ui/Video.java
index b54d404da6..939614c7a1 100644
--- a/server/src/com/vaadin/ui/Video.java
+++ b/server/src/com/vaadin/ui/Video.java
@@ -16,8 +16,8 @@
 
 package com.vaadin.ui;
 
+import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.video.VideoState;
-import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.gwt.server.ResourceReference;
 
 /**
diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java
index 6102350566..af85439e23 100644
--- a/server/src/com/vaadin/ui/Window.java
+++ b/server/src/com/vaadin/ui/Window.java
@@ -31,12 +31,12 @@ import com.vaadin.event.ShortcutAction;
 import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.event.ShortcutAction.ModifierKey;
 import com.vaadin.event.ShortcutListener;
+import com.vaadin.server.PaintException;
+import com.vaadin.server.PaintTarget;
+import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.window.WindowServerRpc;
 import com.vaadin.shared.ui.window.WindowState;
-import com.vaadin.terminal.PaintException;
-import com.vaadin.terminal.PaintTarget;
-import com.vaadin.terminal.Vaadin6Component;
 
 /**
  * A component that represents a floating popup window that can be added to a
@@ -127,7 +127,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier,
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.ui.Panel#paintContent(com.vaadin.terminal.PaintTarget)
+     * @see com.vaadin.ui.Panel#paintContent(com.vaadin.server.PaintTarget)
      */
 
     @Override