Merged com.vaadin.terminal.gwt.server into com.vaadin.server (#9431)

WebContent/WEB-INF/portlet.xml

 	<portlet>
 		<portlet-name>JSR286TestPortlet</portlet-name>
 		<display-name>Vaadin Portlet 2.0 Test</display-name>
-		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
+		<portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class>
 		<init-param>
 			<name>application</name>
 			<value>com.vaadin.tests.integration.JSR286PortletApplication</value>
         <portlet-name>Vaadin Liferay Theme Portlet</portlet-name>
         <display-name>Vaadin Liferay Theme</display-name>
         
-        <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
+        <portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class>
         <init-param>
             <name>application</name>
             <value>com.vaadin.tests.integration.LiferayThemeDemo</value>

WebContent/WEB-INF/web.xml

 	<!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet -->
 	<servlet>
 		<servlet-name>IntegrationTest</servlet-name>
-		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+		<servlet-class>com.vaadin.server.ApplicationServlet</servlet-class>
 		<init-param>
 			<param-name>application</param-name>
 			<param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value>

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

 import com.vaadin.client.ServerConnector;
 import com.vaadin.client.ui.UnknownComponentConnector;
 import com.vaadin.client.ui.UI.UIConnector;
+import com.vaadin.server.ClientConnector;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.terminal.gwt.server.ClientConnector;
 
 /**
  * WidgetMapGenerator's are GWT generator to build WidgetMapImpl dynamically

client/src/com/vaadin/client/ApplicationConfiguration.java

          * 
          * @return a string with the version
          * 
-         * @see com.vaadin.terminal.gwt.server.AbstractApplicationServlet#VERSION
+         * @see com.vaadin.server.AbstractApplicationServlet#VERSION
          */
         private native String getVaadinVersion()
         /*-{

client/src/com/vaadin/client/ApplicationConnection.java

 /**
  * This is the client side communication "engine", managing client-server
  * communication with its server side counterpart
- * com.vaadin.terminal.gwt.server.AbstractCommunicationManager.
+ * com.vaadin.server.AbstractCommunicationManager.
  * 
  * Client-side connectors receive updates from the corresponding server-side
  * connector (typically component) as state updates or RPC calls. The connector

client/src/com/vaadin/client/communication/JSONSerializer.java

      * Creates and deserializes an object received from the server. Must be
      * compatible with {@link #serialize(Object, ConnectorMap)} and also with
      * the server side JsonCodec.encode(Object,
-     * com.vaadin.terminal.gwt.server.PaintableIdMapper) .
+     * com.vaadin.server.PaintableIdMapper) .
      * 
      * @param jsonValue
      *            JSON map from property name to property value
      * Serialize the given object into JSON. Must be compatible with
      * {@link #deserialize(JSONObject, ConnectorMap)} and also with the server
      * side JsonCodec.decode(com.vaadin.external.json.JSONArray,
-     * com.vaadin.terminal.gwt.server.PaintableIdMapper)
+     * com.vaadin.server.PaintableIdMapper)
      * 
      * @param value
      *            The object to serialize

client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java

     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.terminal
-     * .gwt.client.UIDL, com.vaadin.client.ApplicationConnection)
+     * @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.client.UIDL,
+     * com.vaadin.client.ApplicationConnection)
      */
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {

client/src/com/vaadin/client/ui/table/TableConnector.java

     /*
      * (non-Javadoc)
      * 
-     * @see
-     * com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.terminal
-     * .gwt.client.UIDL, com.vaadin.client.ApplicationConnection)
+     * @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.client.UIDL,
+     * com.vaadin.client.ApplicationConnection)
      */
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {

server/src/com/vaadin/Application.java

 import com.vaadin.data.util.converter.ConverterFactory;
 import com.vaadin.data.util.converter.DefaultConverterFactory;
 import com.vaadin.event.EventRouter;
+import com.vaadin.server.AbstractApplicationServlet;
 import com.vaadin.server.AbstractErrorMessage;
 import com.vaadin.server.ApplicationResource;
+import com.vaadin.server.BootstrapFragmentResponse;
+import com.vaadin.server.BootstrapListener;
+import com.vaadin.server.BootstrapPageResponse;
+import com.vaadin.server.BootstrapResponse;
+import com.vaadin.server.ChangeVariablesErrorEvent;
+import com.vaadin.server.ClientConnector;
 import com.vaadin.server.CombinedRequest;
 import com.vaadin.server.DeploymentConfiguration;
 import com.vaadin.server.RequestHandler;
 import com.vaadin.server.Terminal;
 import com.vaadin.server.UIProvider;
 import com.vaadin.server.VariableOwner;
+import com.vaadin.server.WebApplicationContext;
 import com.vaadin.server.WrappedRequest;
 import com.vaadin.server.WrappedResponse;
 import com.vaadin.server.WrappedRequest.BrowserDetails;
 import com.vaadin.service.ApplicationContext;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
-import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse;
-import com.vaadin.terminal.gwt.server.BootstrapListener;
-import com.vaadin.terminal.gwt.server.BootstrapPageResponse;
-import com.vaadin.terminal.gwt.server.BootstrapResponse;
-import com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent;
-import com.vaadin.terminal.gwt.server.ClientConnector;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractField;

server/src/com/vaadin/annotations/JavaScript.java

 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.terminal.gwt.server.ClientConnector;
+import com.vaadin.server.ClientConnector;
 
 /**
  * If this annotation is present on a {@link ClientConnector} class, the

server/src/com/vaadin/annotations/StyleSheet.java

 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.terminal.gwt.server.ClientConnector;
+import com.vaadin.server.ClientConnector;
 
 /**
  * If this annotation is present on a {@link ClientConnector} class, the

server/src/com/vaadin/data/Validator.java

 
 import java.io.Serializable;
 
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
+import com.vaadin.server.AbstractApplicationServlet;
 
 /**
  * Interface that implements a method for validating if an {@link Object} is

server/src/com/vaadin/package.html

 
 <body bgcolor="white">
 
-<p>The Vaadin base package. Contains the Application class, the
-starting point of any application that uses Vaadin.</p>
+	<p>The Vaadin base package. Contains the Application class, the
+		starting point of any application that uses Vaadin.</p>
 
-<p>Contains all Vaadin core classes. A Vaadin application is based
-on the {@link com.vaadin.Application} class and deployed as a servlet
-using {@link com.vaadin.terminal.gwt.server.ApplicationServlet} or
-{@link com.vaadin.terminal.gwt.server.GAEApplicationServlet} (for Google
-App Engine).</p>
+	<p>Contains all Vaadin core classes. A Vaadin application is based
+		on the {@link com.vaadin.Application} class and deployed as a servlet
+		using {@link com.vaadin.server.ApplicationServlet} or {@link
+		com.vaadin.server.GAEApplicationServlet} (for Google App Engine).</p>
 
-<p>Vaadin applications can also be deployed as portlets using {@link
-com.vaadin.terminal.gwt.server.ApplicationPortlet} (JSR-168) or {@link
-com.vaadin.terminal.gwt.server.ApplicationPortlet2} (JSR-286).</p>
+	<p>Vaadin applications can also be deployed as portlets using
+		{@link com.vaadin.server.ApplicationPortlet2} (JSR-286).</p>
 
-<p>All classes in Vaadin are serializable unless otherwise noted.
-This allows Vaadin applications to run in cluster and cloud
-environments.</p>
+	<p>All classes in Vaadin are serializable unless otherwise noted.
+		This allows Vaadin applications to run in cluster and cloud
+		environments.</p>
 
 
 </body>

server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java → server/src/com/vaadin/server/AbstractApplicationPortlet.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
 import com.vaadin.Application.ApplicationStartEvent;
 import com.vaadin.Application.SystemMessages;
 import com.vaadin.UIRequiresMoreInformationException;
-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.server.AbstractCommunicationManager.Callback;
 import com.vaadin.ui.UI;
 
 /**

server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java → server/src/com/vaadin/server/AbstractApplicationServlet.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
 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.server.AbstractCommunicationManager.Callback;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback;
 import com.vaadin.ui.UI;
 
 /**

server/src/com/vaadin/server/AbstractClientConnector.java

 import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.shared.communication.SharedState;
-import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
-import com.vaadin.terminal.gwt.server.ClientConnector;
-import com.vaadin.terminal.gwt.server.ClientMethodInvocation;
-import com.vaadin.terminal.gwt.server.RpcManager;
-import com.vaadin.terminal.gwt.server.RpcTarget;
-import com.vaadin.terminal.gwt.server.ServerRpcManager;
 import com.vaadin.ui.HasComponents;
 import com.vaadin.ui.UI;
 

server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java → server/src/com/vaadin/server/AbstractCommunicationManager.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
 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.BootstrapHandler.BootstrapContext;
+import com.vaadin.server.ComponentSizeValidator.InvalidLayout;
+import com.vaadin.server.RpcManager.RpcInvocationException;
 import com.vaadin.server.StreamVariable.StreamingEndEvent;
 import com.vaadin.server.StreamVariable.StreamingErrorEvent;
 import com.vaadin.server.Terminal.ErrorEvent;
 import com.vaadin.shared.communication.SharedState;
 import com.vaadin.shared.communication.UidlValue;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.gwt.server.BootstrapHandler.BootstrapContext;
-import com.vaadin.terminal.gwt.server.ComponentSizeValidator.InvalidLayout;
-import com.vaadin.terminal.gwt.server.RpcManager.RpcInvocationException;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Component;

server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java → server/src/com/vaadin/server/AbstractDeploymentConfiguration.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.lang.reflect.Constructor;
 import java.util.Iterator;
 import java.util.ServiceLoader;
 import java.util.logging.Logger;
 
-import com.vaadin.server.DeploymentConfiguration;
 
 public abstract class AbstractDeploymentConfiguration implements
         DeploymentConfiguration {

server/src/com/vaadin/server/AbstractErrorMessage.java

 
 import com.vaadin.data.Buffered;
 import com.vaadin.data.Validator;
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
 
 /**
  * Base class for component error messages.

server/src/com/vaadin/server/AbstractExtension.java

 
 package com.vaadin.server;
 
-import com.vaadin.terminal.gwt.server.ClientConnector;
 
 /**
  * An extension is an entity that is attached to a Component or another

server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java → server/src/com/vaadin/server/AbstractStreamingEvent.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import com.vaadin.server.StreamVariable.StreamingEvent;
 

server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java → server/src/com/vaadin/server/AbstractWebApplicationContext.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.PrintWriter;
 import java.io.Serializable;
 import javax.servlet.http.HttpSessionBindingListener;
 
 import com.vaadin.Application;
-import com.vaadin.server.ApplicationResource;
 import com.vaadin.service.ApplicationContext;
 import com.vaadin.shared.ApplicationConstants;
 

server/src/com/vaadin/terminal/gwt/server/AddonContext.java → server/src/com/vaadin/server/AddonContext.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 
 import com.vaadin.Application;
 import com.vaadin.event.EventRouter;
-import com.vaadin.server.DeploymentConfiguration;
 import com.vaadin.tools.ReflectTools;
 
 /**
  * <p>
  * By default, AddonContextListeners are loaded using {@link ServiceLoader},
  * which means that the file
- * META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener will be
- * checked for lines containing fully qualified names of classes to use. This
- * behavior can however be overridden for custom deployment situations (e.g. to
- * use CDI or OSGi) by overriding
+ * META-INF/services/com.vaadin.server.AddonContextListener will be checked for
+ * lines containing fully qualified names of classes to use. This behavior can
+ * however be overridden for custom deployment situations (e.g. to use CDI or
+ * OSGi) by overriding
  * {@link DeploymentConfiguration#getAddonContextListeners()}.
  * 
  * @author Vaadin Ltd

server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java → server/src/com/vaadin/server/AddonContextEvent.java

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

server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java → server/src/com/vaadin/server/AddonContextListener.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.EventListener;
 
  * Listener that gets notified then the {@link AddonContext} is initialized,
  * allowing an add-on to add listeners to various parts of the framework. In a
  * default configuration, add-ons can register their listeners by including a
- * file named
- * META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener
+ * file named META-INF/services/com.vaadin.server.AddonContextListener
  * containing the fully qualified class names of classes implementing this
  * interface.
  * 

server/src/com/vaadin/terminal/gwt/server/ApplicationPortlet2.java → server/src/com/vaadin/server/ApplicationPortlet2.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException;
+import com.vaadin.server.ServletPortletHelper.ApplicationClassException;
 
 /**
  * TODO Write documentation, fix JavaDoc tags.

server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java → server/src/com/vaadin/server/ApplicationResourceHandler.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.util.regex.Matcher;
 import javax.servlet.http.HttpServletResponse;
 
 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;
 
 public class ApplicationResourceHandler implements RequestHandler {
     private static final Pattern APP_RESOURCE_PATTERN = Pattern

server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java → server/src/com/vaadin/server/ApplicationServlet.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
 import com.vaadin.Application;
-import com.vaadin.server.DefaultUIProvider;
-import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException;
+import com.vaadin.server.ServletPortletHelper.ApplicationClassException;
 
 /**
  * This servlet connects a Vaadin Application to Web.

server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java → server/src/com/vaadin/server/ApplicationStartedEvent.java

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

server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java → server/src/com/vaadin/server/ApplicationStartedListener.java

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

server/src/com/vaadin/terminal/gwt/server/BootstrapDom.java → server/src/com/vaadin/server/BootstrapDom.java

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

server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java → server/src/com/vaadin/server/BootstrapFragmentResponse.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.List;
 
 import org.jsoup.nodes.Node;
 
 import com.vaadin.Application;
-import com.vaadin.server.WrappedRequest;
 
 /**
  * A representation of a bootstrap fragment being generated. The bootstrap

server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java → server/src/com/vaadin/server/BootstrapHandler.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
 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;

server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java → server/src/com/vaadin/server/BootstrapListener.java

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

server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java → server/src/com/vaadin/server/BootstrapPageResponse.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.Map;
 
 import org.jsoup.nodes.Document;
 
 import com.vaadin.Application;
-import com.vaadin.server.WrappedRequest;
-import com.vaadin.server.WrappedResponse;
 
 /**
  * A representation of a bootstrap page being generated. The bootstrap page

server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java → server/src/com/vaadin/server/BootstrapResponse.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.EventObject;
 
 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /**

server/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java → server/src/com/vaadin/server/ChangeVariablesErrorEvent.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.Map;
 

server/src/com/vaadin/terminal/gwt/server/ClientConnector.java → server/src/com/vaadin/server/ClientConnector.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.Collection;
 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.ui.Component;

server/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java → server/src/com/vaadin/server/ClientMethodInvocation.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;

server/src/com/vaadin/server/CombinedRequest.java

 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
 import com.vaadin.external.json.JSONObject;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
-import com.vaadin.terminal.gwt.server.WebBrowser;
 
 /**
  * A {@link WrappedRequest} with path and parameters from one request and

server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java → server/src/com/vaadin/server/CommunicationManager.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.InputStream;
 import java.net.URL;
 
 import com.vaadin.Application;
 import com.vaadin.external.json.JSONException;
-import com.vaadin.server.PaintException;
-import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 /**

server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java → server/src/com/vaadin/server/ComponentSizeValidator.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.PrintStream;
 import java.io.PrintWriter;

server/src/com/vaadin/terminal/gwt/server/Constants.java → server/src/com/vaadin/server/Constants.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 /**
  * TODO Document me!

server/src/com/vaadin/server/DeploymentConfiguration.java

 import javax.servlet.ServletContext;
 
 import com.vaadin.service.ApplicationContext;
-import com.vaadin.terminal.gwt.server.AddonContext;
-import com.vaadin.terminal.gwt.server.AddonContextListener;
 
 /**
  * Provide deployment specific settings that are required outside terminal

server/src/com/vaadin/server/DownloadStream.java

 
 import javax.servlet.http.HttpServletResponse;
 
-import com.vaadin.terminal.gwt.server.Constants;
 
 /**
  * Downloadable stream.

server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java → server/src/com/vaadin/server/DragAndDropService.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.PrintWriter;
 import java.util.Collection;
 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;

server/src/com/vaadin/terminal/gwt/server/EncodeResult.java → server/src/com/vaadin/server/EncodeResult.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 public class EncodeResult {
     private final Object encodedValue;

server/src/com/vaadin/server/Extension.java

 
 package com.vaadin.server;
 
-import com.vaadin.terminal.gwt.server.ClientConnector;
 
 /**
  * An extension is an entity that is attached to a Component or another

server/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java → server/src/com/vaadin/server/GAEApplicationServlet.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
  * <pre>
  *      &lt;servlet&gt;
  *              &lt;servlet-name&gt;HelloWorld&lt;/servlet-name&gt;
- *              &lt;servlet-class&gt;com.vaadin.terminal.gwt.server.GAEApplicationServlet&lt;/servlet-class&gt;
+ *              &lt;servlet-class&gt;com.vaadin.server.GAEApplicationServlet&lt;/servlet-class&gt;
  *              &lt;init-param&gt;
  *                      &lt;param-name&gt;application&lt;/param-name&gt;
  *                      &lt;param-value&gt;com.vaadin.demo.HelloWorld&lt;/param-value&gt;

server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java → server/src/com/vaadin/server/HttpServletRequestListener.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
 import javax.servlet.http.HttpServletResponse;
 
 import com.vaadin.Application;
-import com.vaadin.server.Terminal;
 import com.vaadin.service.ApplicationContext.TransactionListener;
 
 /**

server/src/com/vaadin/terminal/gwt/server/JsonCodec.java → server/src/com/vaadin/server/JsonCodec.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.beans.IntrospectionException;
 import java.beans.Introspector;

server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java → server/src/com/vaadin/server/JsonPaintTarget.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.PrintWriter;
 import java.io.Serializable;
 import java.util.Vector;
 import java.util.logging.Logger;
 
-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;

server/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java → server/src/com/vaadin/server/NoInputStreamException.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 @SuppressWarnings("serial")
 public class NoInputStreamException extends Exception {

server/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java → server/src/com/vaadin/server/NoOutputStreamException.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 @SuppressWarnings("serial")
 public class NoOutputStreamException extends Exception {

server/src/com/vaadin/server/Page.java

 import com.vaadin.shared.ui.BorderStyle;
 import com.vaadin.shared.ui.ui.PageClientRpc;
 import com.vaadin.shared.ui.ui.UIConstants;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
-import com.vaadin.terminal.gwt.server.WebBrowser;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.JavaScript;
 import com.vaadin.ui.Notification;

server/src/com/vaadin/server/PaintTarget.java

 import java.util.Map;
 
 import com.vaadin.server.StreamVariable.StreamingStartEvent;
-import com.vaadin.terminal.gwt.server.ClientConnector;
 import com.vaadin.ui.Component;
 
 /**

server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java → server/src/com/vaadin/server/PortletApplicationContext2.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.File;
 import java.io.Serializable;
 import javax.xml.namespace.QName;
 
 import com.vaadin.Application;
-import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.UI;
 
 /**

server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java → server/src/com/vaadin/server/PortletCommunicationManager.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.InputStream;
 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.ui.UI;
 

server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java → server/src/com/vaadin/server/PortletRequestListener.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
 import javax.servlet.Filter;
 
 import com.vaadin.Application;
-import com.vaadin.server.Terminal;
 import com.vaadin.service.ApplicationContext.TransactionListener;
 
 /**

server/src/com/vaadin/terminal/gwt/server/RequestTimer.java → server/src/com/vaadin/server/RequestTimer.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 

server/src/com/vaadin/terminal/gwt/server/ResourceReference.java → server/src/com/vaadin/server/ResourceReference.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import com.vaadin.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;
 
 public class ResourceReference extends URLReference {

server/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java → server/src/com/vaadin/server/RestrictedRenderResponse.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.OutputStream;

server/src/com/vaadin/terminal/gwt/server/RpcManager.java → server/src/com/vaadin/server/RpcManager.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 

server/src/com/vaadin/terminal/gwt/server/RpcTarget.java → server/src/com/vaadin/server/RpcTarget.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.Serializable;
 
-import com.vaadin.server.VariableOwner;
 
 /**
  * Marker interface for server side classes that can receive RPC calls.

server/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java → server/src/com/vaadin/server/ServerRpcManager.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;

server/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java → server/src/com/vaadin/server/ServerRpcMethodInvocation.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.lang.reflect.Method;
 import java.util.Map;

server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java → server/src/com/vaadin/server/ServletPortletHelper.java

-package com.vaadin.terminal.gwt.server;
+package com.vaadin.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.ui.UI;
 

server/src/com/vaadin/terminal/gwt/server/SessionExpiredException.java → server/src/com/vaadin/server/SessionExpiredException.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 @SuppressWarnings("serial")
 public class SessionExpiredException extends Exception {

server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java → server/src/com/vaadin/server/StreamingEndEventImpl.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import com.vaadin.server.StreamVariable.StreamingEndEvent;
 

server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java → server/src/com/vaadin/server/StreamingErrorEventImpl.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import com.vaadin.server.StreamVariable.StreamingErrorEvent;
 

server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java → server/src/com/vaadin/server/StreamingProgressEventImpl.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import com.vaadin.server.StreamVariable.StreamingProgressEvent;
 

server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java → server/src/com/vaadin/server/StreamingStartEventImpl.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import com.vaadin.server.StreamVariable.StreamingStartEvent;
 

server/src/com/vaadin/server/SystemError.java

 
 package com.vaadin.server;
 
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
 
 /**
  * <code>SystemError</code> is an error message for a problem caused by error in

server/src/com/vaadin/terminal/gwt/server/SystemMessageException.java → server/src/com/vaadin/server/SystemMessageException.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 @SuppressWarnings("serial")
 public class SystemMessageException extends RuntimeException {

server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java → server/src/com/vaadin/server/UnsupportedBrowserHandler.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.Writer;
 
 import com.vaadin.Application;
-import com.vaadin.server.RequestHandler;
-import com.vaadin.server.WrappedRequest;
-import com.vaadin.server.WrappedResponse;
 
 /**
  * A {@link RequestHandler} that presents an informative page if the browser in

server/src/com/vaadin/terminal/gwt/server/UploadException.java → server/src/com/vaadin/server/UploadException.java

  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 @SuppressWarnings("serial")
 public class UploadException extends Exception {

server/src/com/vaadin/server/Vaadin6Component.java

      * {@link #paintContent(PaintTarget)} to be called before sending changes to
      * the client.
      * 
-     * @see com.vaadin.terminal.gwt.server.ClientConnector#markAsDirty()
+     * @see com.vaadin.server.ClientConnector#markAsDirty()
      */
     @Override
     public void markAsDirty();

server/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java → server/src/com/vaadin/server/WebApplicationContext.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.File;
 import java.util.Enumeration;

server/src/com/vaadin/terminal/gwt/server/WebBrowser.java → server/src/com/vaadin/server/WebBrowser.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.util.Date;
 import java.util.Locale;
 
-import com.vaadin.server.WrappedRequest;
 import com.vaadin.shared.VBrowserDetails;
 
 /**

server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java → server/src/com/vaadin/server/WrappedHttpServletRequest.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 
 import com.vaadin.Application;
-import com.vaadin.server.CombinedRequest;
-import com.vaadin.server.DeploymentConfiguration;
-import com.vaadin.server.WrappedRequest;
 
 /**
  * Wrapper for {@link HttpServletRequest}.

server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java → server/src/com/vaadin/server/WrappedHttpServletResponse.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
-import com.vaadin.server.DeploymentConfiguration;
-import com.vaadin.server.WrappedResponse;
 
 /**
  * Wrapper for {@link HttpServletResponse}.

server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java → server/src/com/vaadin/server/WrappedPortletRequest.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.InputStream;
 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;
 
 /**

server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java → server/src/com/vaadin/server/WrappedPortletResponse.java

  * the License.
  */
 
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import javax.portlet.PortletResponse;
 import javax.portlet.ResourceResponse;
 
-import com.vaadin.server.DeploymentConfiguration;
-import com.vaadin.server.WrappedResponse;
 
 /**
  * Wrapper for {@link PortletResponse} and its subclasses.

server/src/com/vaadin/server/WrappedRequest.java

 import com.vaadin.Application;
 import com.vaadin.UIRequiresMoreInformationException;
 import com.vaadin.annotations.EagerInit;
-import com.vaadin.terminal.gwt.server.WebBrowser;
 import com.vaadin.ui.UI;
 
 /**

server/src/com/vaadin/service/ApplicationContext.java

 import java.util.Collection;
 
 import com.vaadin.Application;
+import com.vaadin.server.AbstractCommunicationManager;
 import com.vaadin.server.ApplicationResource;
-import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
 
 /**
  * <code>ApplicationContext</code> provides information about the running

server/src/com/vaadin/ui/AbstractComponent.java

 import com.vaadin.event.MethodEventSource;
 import com.vaadin.event.ShortcutListener;
 import com.vaadin.server.AbstractClientConnector;
+import com.vaadin.server.ClientConnector;
+import com.vaadin.server.ComponentSizeValidator;
 import com.vaadin.server.ErrorMessage;
 import com.vaadin.server.Resource;
+import com.vaadin.server.ResourceReference;
 import com.vaadin.server.Terminal;
 import com.vaadin.shared.ComponentState;
-import com.vaadin.terminal.gwt.server.ClientConnector;
-import com.vaadin.terminal.gwt.server.ComponentSizeValidator;
-import com.vaadin.terminal.gwt.server.ResourceReference;
 import com.vaadin.tools.ReflectTools;
 
 /**

server/src/com/vaadin/ui/AbstractComponentContainer.java

 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.vaadin.terminal.gwt.server.ComponentSizeValidator;
+import com.vaadin.server.ComponentSizeValidator;
 
 /**
  * Extension to {@link AbstractComponent} that defines the default

server/src/com/vaadin/ui/AbstractEmbedded.java

 package com.vaadin.ui;
 
 import com.vaadin.server.Resource;
+import com.vaadin.server.ResourceReference;
 import com.vaadin.shared.ui.AbstractEmbeddedState;
-import com.vaadin.terminal.gwt.server.ResourceReference;
 
 /**
  * Abstract base for embedding components.

server/src/com/vaadin/ui/AbstractMedia.java

 import java.util.List;
 
 import com.vaadin.server.Resource;
+import com.vaadin.server.ResourceReference;
 import com.vaadin.shared.communication.URLReference;
 import com.vaadin.shared.ui.AbstractMediaState;
 import com.vaadin.shared.ui.MediaControl;
-import com.vaadin.terminal.gwt.server.ResourceReference;
 
 /**
  * Abstract base class for the HTML5 media components.

server/src/com/vaadin/ui/Component.java

 
 import com.vaadin.Application;
 import com.vaadin.event.FieldEvents;
+import com.vaadin.server.ClientConnector;
 import com.vaadin.server.ErrorMessage;
 import com.vaadin.server.Resource;
 import com.vaadin.server.Sizeable;
 import com.vaadin.server.VariableOwner;
-import com.vaadin.terminal.gwt.server.ClientConnector;
 
 /**
  * {@code Component} is the top-level interface that is and must be implemented

server/src/com/vaadin/ui/ConnectorTracker.java

 import java.util.logging.Logger;
 
 import com.vaadin.server.AbstractClientConnector;
-import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
-import com.vaadin.terminal.gwt.server.ClientConnector;
+import com.vaadin.server.AbstractCommunicationManager;
+import com.vaadin.server.ClientConnector;
 
 /**
  * A class which takes care of book keeping of {@link ClientConnector}s for a

server/src/com/vaadin/ui/CustomLayout.java

 import java.util.Map;
 import java.util.Set;
 
+import com.vaadin.server.JsonPaintTarget;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.server.Vaadin6Component;
 import com.vaadin.shared.ui.customlayout.CustomLayoutState;
-import com.vaadin.terminal.gwt.server.JsonPaintTarget;
 
 /**
  * <p>

server/src/com/vaadin/ui/UI.java

 import com.vaadin.event.ActionManager;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
+import com.vaadin.server.AbstractApplicationServlet;
 import com.vaadin.server.Page;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.ui.UIConstants;
 import com.vaadin.shared.ui.ui.UIServerRpc;
 import com.vaadin.shared.ui.ui.UIState;
-import com.vaadin.terminal.gwt.server.AbstractApplicationServlet;
 import com.vaadin.tools.ReflectTools;
 
 /**

server/src/com/vaadin/ui/Upload.java

 import java.util.LinkedHashSet;
 import java.util.Map;
 
+import com.vaadin.server.NoInputStreamException;
+import com.vaadin.server.NoOutputStreamException;
 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;
 
 /**
  * Component for uploading files from client to server.

server/src/com/vaadin/ui/Video.java

 package com.vaadin.ui;
 
 import com.vaadin.server.Resource;
+import com.vaadin.server.ResourceReference;
 import com.vaadin.shared.ui.video.VideoState;
-import com.vaadin.terminal.gwt.server.ResourceReference;
 
 /**
  * The Video component translates into an HTML5 <video> element and as

shared/src/com/vaadin/shared/Connector.java

  * wanting to communicate with server side should implement
  * {@link com.vaadin.client.ServerConnector} and server side
  * classes should implement
- * {@link com.vaadin.terminal.gwt.server.ClientConnector}.
+ * {@link com.vaadin.server.ClientConnector}.
  * </p>
  * 
  * @author Vaadin Ltd

shared/src/com/vaadin/shared/VBrowserDetails.java

  * Class that parses the user agent string from the browser and provides
  * information about the browser. Used internally by
  * {@link com.vaadin.client.BrowserInfo} and
- * {@link com.vaadin.terminal.gwt.server.WebBrowser}. Should not be used
+ * {@link com.vaadin.server.WebBrowser}. Should not be used
  * directly.
  * 
  * @author Vaadin Ltd.

shared/src/com/vaadin/shared/ui/Connect.java

 /**
  * Annotation defining the server side connector that this ClientSideConnector
  * should connect to. The value must always by a class extending
- * {@link com.vaadin.terminal.gwt.server.ClientConnector}.
+ * {@link com.vaadin.server.ClientConnector}.
  * <p>
  * With this annotation client side Vaadin connector is marked to have a server
  * side counterpart. The value of the annotation is the class of server side

tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java → tests/client-side/com/vaadin/server/JSONSerializerTest.java

-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 /*
  * Copyright 2011 Vaadin Ltd.
 
 import com.vaadin.client.communication.JsonDecoder;
 import com.vaadin.client.communication.JsonEncoder;
+import com.vaadin.server.JsonCodec;
+import com.vaadin.server.JsonCodec.BeanProperty;
 import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState;
-import com.vaadin.terminal.gwt.server.JsonCodec.BeanProperty;
 
 /**
  * Tests for {@link JsonCodec}, {@link JsonEncoder}, {@link JsonDecoder}