Move and rename server classes which go into the compatibility package

* Use com.vaadin.v7
* Use the same class name as in Vaadin 7
* Use a "vaadin7-" declarative prefix for Vaadin 7 components

Change-Id: I19a27f3835b18980b91a4f8f9464b2adde1a5fd5

38 files changed, 45 insertions, 46 deletions

diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java
index fad8918c92..d0d2b6196b 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java
@@ -28,7 +28,7 @@ import elemental.json.JsonObject;
  * @since 7.4
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.renderers.ButtonRenderer.class)
+@Connect(com.vaadin.v7.ui.renderers.ButtonRenderer.class)
 public class ButtonRendererConnector
         extends ClickableRendererConnector<String> {
 
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java
index 4b8c3872da..4eb56376f4 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java
@@ -28,7 +28,7 @@ import com.vaadin.shared.ui.Connect;
  * @since 7.4
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.renderers.DateRenderer.class)
+@Connect(com.vaadin.v7.ui.renderers.DateRenderer.class)
 public class DateRendererConnector extends TextRendererConnector {
     // No implementation needed
 }
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java
index 000a24af00..49874c84b4 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java
@@ -18,7 +18,7 @@ package com.vaadin.client.connectors;
 import com.vaadin.client.ServerConnector;
 import com.vaadin.client.extensions.AbstractExtensionConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.ui.LegacyGrid.DetailComponentManager;
+import com.vaadin.v7.ui.Grid.DetailComponentManager;
 
 /**
  * Client-side connector for the DetailComponentManager of Grid.
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/GridConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/GridConnector.java
index 045f51f508..b30557885a 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/GridConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/GridConnector.java
@@ -95,7 +95,6 @@ import com.vaadin.shared.ui.grid.GridStaticSectionState;
 import com.vaadin.shared.ui.grid.GridStaticSectionState.CellState;
 import com.vaadin.shared.ui.grid.GridStaticSectionState.RowState;
 import com.vaadin.shared.ui.grid.ScrollDestination;
-import com.vaadin.ui.LegacyGrid;
 
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;
@@ -111,7 +110,7 @@ import elemental.json.JsonValue;
  * @since 7.4
  * @author Vaadin Ltd
  */
-@Connect(LegacyGrid.class)
+@Connect(com.vaadin.v7.ui.Grid.class)
 public class GridConnector extends AbstractHasComponentsConnector
         implements SimpleManagedLayout, DeferredWorker {
 
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java
index 7949eeab3c..d71cb28a7d 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java
@@ -32,7 +32,7 @@ import elemental.json.JsonValue;
  * @since 7.4
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.renderers.ImageRenderer.class)
+@Connect(com.vaadin.v7.ui.renderers.ImageRenderer.class)
 public class ImageRendererConnector extends ClickableRendererConnector<String> {
 
     @Override
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java
index 1515f1aead..4bd618dacd 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java
@@ -30,7 +30,7 @@ import com.vaadin.client.widget.grid.CellReference;
 import com.vaadin.client.widget.grid.RendererCellReference;
 import com.vaadin.shared.JavaScriptExtensionState;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.ui.renderers.AbstractJavaScriptRenderer;
+import com.vaadin.v7.ui.renderers.AbstractJavaScriptRenderer;
 
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java
index e7494737cb..7a13863a9e 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java
@@ -46,7 +46,7 @@ import com.vaadin.shared.ui.grid.GridState;
 import com.vaadin.shared.ui.grid.Range;
 import com.vaadin.shared.ui.grid.selection.MultiSelectionModelServerRpc;
 import com.vaadin.shared.ui.grid.selection.MultiSelectionModelState;
-import com.vaadin.ui.LegacyGrid.MultiSelectionModel;
+import com.vaadin.v7.ui.Grid.MultiSelectionModel;
 
 import elemental.json.JsonObject;
 
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java
index 1a080f5082..b3fbb16e6b 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java
@@ -19,7 +19,7 @@ import com.vaadin.client.ServerConnector;
 import com.vaadin.client.widget.grid.selection.SelectionModel;
 import com.vaadin.client.widget.grid.selection.SelectionModelNone;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.ui.LegacyGrid.NoSelectionModel;
+import com.vaadin.v7.ui.Grid.NoSelectionModel;
 
 import elemental.json.JsonObject;
 
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java
index ff16047b0d..6383594ca2 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java
@@ -28,7 +28,7 @@ import com.vaadin.shared.ui.Connect;
  * @since 7.4
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.renderers.NumberRenderer.class)
+@Connect(com.vaadin.v7.ui.renderers.NumberRenderer.class)
 public class NumberRendererConnector extends TextRendererConnector {
     // no implementation needed
 }
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java
index 5687d031aa..57bafc69ba 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java
@@ -24,7 +24,7 @@ import com.vaadin.shared.ui.Connect;
  * @since 7.4
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.renderers.ProgressBarRenderer.class)
+@Connect(com.vaadin.v7.ui.renderers.ProgressBarRenderer.class)
 public class ProgressBarRendererConnector
         extends AbstractGridRendererConnector<Double> {
 
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java
index 52fa8a2e48..d33cf72a33 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java
@@ -42,7 +42,7 @@ import elemental.json.JsonObject;
  * @since 7.4
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.server.communication.data.RpcDataProviderExtension.class)
+@Connect(com.vaadin.v7.server.communication.data.RpcDataProviderExtension.class)
 public class RpcDataSourceConnector extends AbstractExtensionConnector {
 
     /**
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java
index 980c4458d4..84f0633e9b 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java
@@ -27,7 +27,7 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.grid.GridState;
 import com.vaadin.shared.ui.grid.selection.SingleSelectionModelServerRpc;
 import com.vaadin.shared.ui.grid.selection.SingleSelectionModelState;
-import com.vaadin.ui.LegacyGrid.SingleSelectionModel;
+import com.vaadin.v7.ui.Grid.SingleSelectionModel;
 
 import elemental.json.JsonObject;
 
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java
index d3a289ec3e..faa09fda13 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java
@@ -24,7 +24,7 @@ import com.vaadin.shared.ui.Connect;
  * @since 7.4
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.renderers.TextRenderer.class)
+@Connect(com.vaadin.v7.ui.renderers.TextRenderer.class)
 public class TextRendererConnector extends AbstractGridRendererConnector<String> {
 
     @Override
diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
index 95c47dd242..8888c1041b 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java
@@ -25,7 +25,7 @@ import com.vaadin.shared.ui.Connect;
  * @since 7.4
  * @author Vaadin Ltd
  */
-@Connect(com.vaadin.ui.renderers.HtmlRenderer.class)
+@Connect(com.vaadin.v7.ui.renderers.HtmlRenderer.class)
 public class UnsafeHtmlRendererConnector
         extends AbstractGridRendererConnector<String> {
 
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/VFilterSelect.java b/compatibility-client/src/main/java/com/vaadin/client/ui/VFilterSelect.java
index 44cbcf28f6..814767e19f 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/VFilterSelect.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/VFilterSelect.java
@@ -182,7 +182,7 @@ public class VFilterSelect extends Composite
 
         /**
          * Gets the style set for this suggestion item. Styles are typically set
-         * by a server-side {@link com.vaadin.ui.ComboBox.ItemStyleGenerator}.
+         * by a server-side {@link com.vaadin.v7.ui.ComboBox.ItemStyleGenerator}.
          * The returned style is prefixed by <code>v-filterselect-item-</code>.
          *
          * @since 7.5.6
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java
index f97ba9d14a..8f6118eed6 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java
@@ -72,7 +72,7 @@ import com.vaadin.shared.ui.calendar.CalendarEventId;
 import com.vaadin.shared.ui.calendar.CalendarServerRpc;
 import com.vaadin.shared.ui.calendar.CalendarState;
 import com.vaadin.shared.ui.calendar.DateConstants;
-import com.vaadin.ui.Calendar;
+import com.vaadin.v7.ui.Calendar;
 
 /**
  * Handles communication between Calendar on the server side and
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
index 828cc689c7..6c1bee17a0 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
@@ -24,11 +24,11 @@ import com.vaadin.client.ui.VColorPickerArea;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc;
-import com.vaadin.ui.ColorPickerArea;
+import com.vaadin.v7.ui.ColorPickerArea;
 
 /**
  * A class that defines an implementation for a color picker connector. Connects
- * the server side {@link com.vaadin.ui.ColorPickerArea} with the client side
+ * the server side {@link com.vaadin.v7.ui.ColorPickerArea} with the client side
  * counterpart {@link VColorPickerArea}
  *
  * @since 7.0.0
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
index 6254e7adbe..cc917a044e 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
@@ -23,11 +23,11 @@ import com.vaadin.client.ui.VColorPicker;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc;
-import com.vaadin.ui.ColorPicker;
+import com.vaadin.v7.ui.ColorPicker;
 
 /**
  * A class that defines default implementation for a color picker connector.
- * Connects the server side {@link com.vaadin.ui.ColorPicker} with the client
+ * Connects the server side {@link com.vaadin.v7.ui.ColorPicker} with the client
  * side counterpart {@link VColorPicker}
  *
  * @since 7.0.0
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
index c05449d7bd..98ebfa086c 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
@@ -26,12 +26,12 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGradientServerRpc;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGradientState;
-import com.vaadin.ui.components.colorpicker.ColorPickerGradient;
+import com.vaadin.v7.ui.components.colorpicker.ColorPickerGradient;
 
 /**
  * A class that defines the default implementation for a color picker gradient
  * connector. Connects the server side
- * {@link com.vaadin.ui.components.colorpicker.ColorPickerGradient} with the
+ * {@link com.vaadin.v7.ui.components.colorpicker.ColorPickerGradient} with the
  * client side counterpart {@link VColorPickerGradient}
  *
  * @since 7.0.0
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
index cd0a3d1466..b842154e40 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
@@ -26,12 +26,12 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGridServerRpc;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGridState;
-import com.vaadin.ui.components.colorpicker.ColorPickerGrid;
+import com.vaadin.v7.ui.components.colorpicker.ColorPickerGrid;
 
 /**
  * A class that defines the default implementation for a color picker grid
  * connector. Connects the server side
- * {@link com.vaadin.ui.components.colorpicker.ColorPickerGrid} with the client
+ * {@link com.vaadin.v7.ui.components.colorpicker.ColorPickerGrid} with the client
  * side counterpart {@link VColorPickerGrid}
  *
  * @since 7.0.0
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
index f6dff893f5..672e428802 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
@@ -35,7 +35,7 @@ import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.combobox.ComboBoxServerRpc;
 import com.vaadin.shared.ui.combobox.ComboBoxState;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
 
 @Connect(ComboBox.class)
 public class ComboBoxConnector extends AbstractFieldConnector
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java
index b02f8df147..cd4bf13ba0 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java
@@ -21,7 +21,7 @@ package com.vaadin.client.ui.dd;
 import com.vaadin.client.ComponentConnector;
 import com.vaadin.client.UIDL;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.ui.AbstractSelect;
+import com.vaadin.v7.ui.AbstractSelect;
 
 @AcceptCriterion(AbstractSelect.TargetItemIs.class)
 final public class VIsOverId extends VAcceptCriterion {
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java
index 6992ebcaad..f8bfe075a3 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java
@@ -21,7 +21,7 @@ package com.vaadin.client.ui.dd;
 import com.vaadin.client.ComponentConnector;
 import com.vaadin.client.UIDL;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.ui.AbstractSelect;
+import com.vaadin.v7.ui.AbstractSelect;
 
 @AcceptCriterion(AbstractSelect.AcceptItem.class)
 final public class VItemIdIs extends VAcceptCriterion {
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/listselect/ListSelectConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/listselect/ListSelectConnector.java
index a69043548b..e288c088a9 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/listselect/ListSelectConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/listselect/ListSelectConnector.java
@@ -19,7 +19,7 @@ package com.vaadin.client.ui.listselect;
 import com.vaadin.client.ui.VListSelect;
 import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.ui.ListSelect;
+import com.vaadin.v7.ui.ListSelect;
 
 @Connect(ListSelect.class)
 public class ListSelectConnector extends OptionGroupBaseConnector {
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java
index 1780d20c69..0063116cdb 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java
@@ -20,7 +20,7 @@ import com.vaadin.client.ui.ConnectorFocusAndBlurHandler;
 import com.vaadin.client.ui.VNativeSelect;
 import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.ui.NativeSelect;
+import com.vaadin.v7.ui.NativeSelect;
 
 @Connect(NativeSelect.class)
 public class NativeSelectConnector extends OptionGroupBaseConnector {
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java
index 3dd3b897a5..e8164632b4 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java
@@ -27,7 +27,7 @@ import com.vaadin.client.ui.VOptionGroup;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.optiongroup.OptionGroupState;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.OptionGroup;
 
 @Connect(OptionGroup.class)
 public class OptionGroupConnector extends OptionGroupBaseConnector {
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java
index a8aeb79d07..2ea59046c7 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java
@@ -27,7 +27,7 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.textarea.RichTextAreaState;
 import com.vaadin.shared.util.SharedUtil;
-import com.vaadin.ui.RichTextArea;
+import com.vaadin.v7.ui.RichTextArea;
 
 @Connect(value = RichTextArea.class, loadStyle = LoadStyle.LAZY)
 public class RichTextAreaConnector extends AbstractFieldConnector
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/table/TableConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/table/TableConnector.java
index ccfb715291..8bd2418aea 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/table/TableConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/table/TableConnector.java
@@ -51,7 +51,7 @@ import com.vaadin.shared.ui.table.TableConstants.Section;
 import com.vaadin.shared.ui.table.TableServerRpc;
 import com.vaadin.shared.ui.table.TableState;
 
-@Connect(com.vaadin.ui.Table.class)
+@Connect(com.vaadin.v7.ui.Table.class)
 public class TableConnector extends AbstractFieldConnector
         implements HasComponentsConnector, ConnectorHierarchyChangeHandler,
         Paintable, DirectionalManagedLayout, PostLayoutListener,
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java b/compatibility-client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java
index 20433dd960..c3b2185de8 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java
@@ -17,7 +17,7 @@ package com.vaadin.client.ui.table;
 
 import com.vaadin.client.ui.dd.VLazyInitItemIdentifiers;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
 
 @AcceptCriterion(Table.TableDropCriterion.class)
 public final class VTableLazyInitItemIdentifiers
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java
index e081a0e0a4..75b6ba21ee 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java
@@ -24,7 +24,7 @@ import com.vaadin.client.ui.VTextArea;
 import com.vaadin.client.v7.ui.textfield.LegacyTextFieldConnector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.textarea.TextAreaState;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
 
 @Connect(TextArea.class)
 public class TextAreaConnector extends LegacyTextFieldConnector {
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java
index c28a58aaad..173048ec1e 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java
@@ -40,7 +40,7 @@ import com.vaadin.shared.ui.MultiSelectMode;
 import com.vaadin.shared.ui.tree.TreeConstants;
 import com.vaadin.shared.ui.tree.TreeServerRpc;
 import com.vaadin.shared.ui.tree.TreeState;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
 
 @Connect(Tree.class)
 public class TreeConnector extends AbstractComponentConnector
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java
index 34b8428582..8f38a8cfb4 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java
@@ -26,7 +26,7 @@ import com.vaadin.client.ui.dd.VAcceptCriterion;
 import com.vaadin.client.ui.dd.VDragAndDropManager;
 import com.vaadin.client.ui.dd.VDragEvent;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
 
 @AcceptCriterion(Tree.TargetInSubtree.class)
 final public class VTargetInSubtree extends VAcceptCriterion {
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java
index 46089af16e..e4ba64e12a 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java
@@ -17,7 +17,7 @@ package com.vaadin.client.ui.tree;
 
 import com.vaadin.client.ui.dd.VLazyInitItemIdentifiers;
 import com.vaadin.shared.ui.dd.AcceptCriterion;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
 
 @AcceptCriterion(Tree.TreeDropCriterion.class)
 public final class VTreeLazyInitItemIdentifiers
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java
index 77074d4cb5..7c1cac61c6 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java
@@ -29,7 +29,7 @@ import com.vaadin.client.ui.table.TableConnector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.treetable.TreeTableConstants;
 import com.vaadin.shared.ui.treetable.TreeTableState;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.TreeTable;
 
 @Connect(TreeTable.class)
 public class TreeTableConnector extends TableConnector {
diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java
index 81e32e5711..5e05dae166 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java
@@ -23,7 +23,7 @@ import com.vaadin.client.ui.VTwinColSelect;
 import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.twincolselect.TwinColSelectState;
-import com.vaadin.ui.TwinColSelect;
+import com.vaadin.v7.ui.TwinColSelect;
 
 @Connect(TwinColSelect.class)
 public class TwinColSelectConnector extends OptionGroupBaseConnector
diff --git a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyDateFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyDateFieldConnector.java
index 6687baa6d4..ee62b03588 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyDateFieldConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyDateFieldConnector.java
@@ -17,13 +17,13 @@ package com.vaadin.client.v7.ui;
 
 import com.vaadin.client.ui.datefield.DateFieldConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.DateField;
 
 /**
  * @author Vaadin Ltd
  *
  */
-@Connect(LegacyDateField.class)
+@Connect(DateField.class)
 @Deprecated
 public class LegacyDateFieldConnector extends DateFieldConnector {
 
diff --git a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyInlineDateFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyInlineDateFieldConnector.java
index 5fb5b7a5dd..60459ff9c0 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyInlineDateFieldConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyInlineDateFieldConnector.java
@@ -17,13 +17,13 @@ package com.vaadin.client.v7.ui;
 
 import com.vaadin.client.ui.datefield.InlineDateFieldConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.v7.ui.LegacyInlineDateField;
+import com.vaadin.v7.ui.InlineDateField;
 
 /**
  * @author Vaadin Ltd
  *
  */
-@Connect(LegacyInlineDateField.class)
+@Connect(InlineDateField.class)
 @Deprecated
 public class LegacyInlineDateFieldConnector extends InlineDateFieldConnector {
 
diff --git a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyPopupDateFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyPopupDateFieldConnector.java
index 9da986d879..15311ade5f 100644
--- a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyPopupDateFieldConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyPopupDateFieldConnector.java
@@ -17,14 +17,14 @@ package com.vaadin.client.v7.ui;
 
 import com.vaadin.client.ui.datefield.PopupDateFieldConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.v7.ui.LegacyPopupDateField;
+import com.vaadin.v7.ui.PopupDateField;
 
 /**
  * @author Vaadin Ltd
  *
  */
 @Deprecated
-@Connect(LegacyPopupDateField.class)
+@Connect(PopupDateField.class)
 public class LegacyPopupDateFieldConnector extends PopupDateFieldConnector {
 
 }