Rename legacy packages to v7

Change-Id: I53f3bd49c234a8d126887f6effa83a3c5c92b4e0
author: Artur Signell <artur@vaadin.com> 2016-08-18 14:57:13 +0300
committer: Artur Signell <artur@vaadin.com> 2016-08-18 20:05:56 +0300
commit: f3c880194b20b9f9d192e72724865233065ccf04 (patch)
tree: 957213861b4f70568aa33380cca0a2beb4601657 /uitest
parent: 387649190cdbb93d11dc3714de73f0dcdc4c4059 (diff)
download: vaadin-framework-f3c880194b20b9f9d192e72724865233065ccf04.tar.gz
vaadin-framework-f3c880194b20b9f9d192e72724865233065ccf04.zip
294 files changed, 390 insertions, 390 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
index a48139f01d..40f0e83287 100644
--- a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
@@ -16,13 +16,13 @@
 
 package com.vaadin.tests;
 
-import com.vaadin.legacy.ui.LegacyField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Component.Event;
 import com.vaadin.ui.Component.Listener;
+import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
diff --git a/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java
index fa2c885a7a..cf12ddaa32 100644
--- a/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.AbstractSelect;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.DateField;
diff --git a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
index 90038925bc..52c14a8185 100644
--- a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
@@ -16,10 +16,10 @@
 
 package com.vaadin.tests;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
index 74d63163fa..fb2e7ae238 100644
--- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
@@ -19,7 +19,6 @@ package com.vaadin.tests;
 import java.util.Date;
 import java.util.Map;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.UserError;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
@@ -30,6 +29,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class PerformanceTestBasicComponentRendering extends CustomComponent {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
index 3caa723779..a467c6b00b 100644
--- a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
+++ b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
@@ -18,7 +18,6 @@ package com.vaadin.tests;
 
 import java.util.Random;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
@@ -34,6 +33,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.Select;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * This example demonstrates layouts. Layouts are populated with sample Vaadin
diff --git a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
index 92e35e8ca6..a043cc0ca4 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.tests;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ClassResource;
 import com.vaadin.server.ErrorMessage;
 import com.vaadin.server.ExternalResource;
@@ -26,6 +25,7 @@ import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component.Listener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.Embedded;
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java
index 1f4a39791d..f124b05832 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java
@@ -16,13 +16,13 @@
 
 package com.vaadin.tests;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TestForAlignments extends CustomComponent {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
index b1bb344124..327e0a5459 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
@@ -17,9 +17,9 @@
 package com.vaadin.tests;
 
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
index eda4636c34..1ecaf51e68 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
@@ -29,8 +29,6 @@ import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.ui.LegacyAbstractField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.StreamResource;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
@@ -48,6 +46,8 @@ import com.vaadin.ui.Upload;
 import com.vaadin.ui.Upload.FinishedEvent;
 import com.vaadin.ui.Upload.StartedEvent;
 import com.vaadin.ui.Upload.StartedListener;
+import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.VerticalLayout;
 
 public class TestForUpload extends CustomComponent
diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
index df19b1a87b..de7c38dd97 100644
--- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
@@ -20,11 +20,11 @@ import java.io.File;
 
 import com.vaadin.data.util.FilesystemContainer;
 import com.vaadin.data.util.FilesystemContainer.FileItem;
-import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.util.SampleDirectory;
 import com.vaadin.ui.Component.Event;
 import com.vaadin.ui.Component.Listener;
+import com.vaadin.v7.ui.LegacyField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
diff --git a/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java b/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
index 8fc887b36e..80ff121ed2 100644
--- a/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
+++ b/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.actions;
 
 import com.vaadin.event.Action;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @SuppressWarnings("serial")
 public class ActionsWithoutKeyCode extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
index b071a6c79e..5ee23dac0e 100644
--- a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
@@ -3,12 +3,12 @@ package com.vaadin.tests.appengine;
 import com.google.apphosting.api.DeadlineExceededException;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ClassResource;
 import com.vaadin.server.DownloadStream;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
diff --git a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
index 6e0fd2358e..50d728a247 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
@@ -18,7 +18,6 @@ package com.vaadin.tests.application;
 import com.vaadin.annotations.Theme;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinServlet;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
@@ -26,6 +25,7 @@ import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java
index acc4d971b6..a066379f27 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.tests.application.calculator;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Alignment;
@@ -28,6 +27,7 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.ColumnHeaderMode;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java
index 6e4ba6775a..8b103b8ee4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java
@@ -4,7 +4,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.AbstractComponentContainer;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
@@ -12,6 +11,7 @@ import com.vaadin.ui.HasComponents.ComponentAttachEvent;
 import com.vaadin.ui.HasComponents.ComponentAttachListener;
 import com.vaadin.ui.HasComponents.ComponentDetachEvent;
 import com.vaadin.ui.HasComponents.ComponentDetachListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.InlineDateField;
 import com.vaadin.ui.NativeButton;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
index 7849124031..ece6cc5cad 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
@@ -6,12 +6,12 @@ import java.util.List;
 import java.util.Locale;
 
 import com.vaadin.data.HasRequired;
-import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.Resource;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Layout.SpacingHandler;
+import com.vaadin.v7.ui.LegacyField;
 
 public abstract class AbstractComponentTestCase<T extends AbstractComponent>
         extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
index fed4cb7f65..8d575c78f4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
@@ -15,11 +15,11 @@
  */
 package com.vaadin.tests.components;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Test to see if AbstractOrderedLayout displays captions correctly with
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java b/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
index 63184ed290..66079d6543 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components;
 
-import com.vaadin.legacy.ui.LegacyPopupDateField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyPopupDateField;
 
 public class AddRemoveSetStyleNamesTest extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
index 26da622f76..b13d53d2d5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
@@ -7,11 +7,11 @@ import java.util.List;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
index 4df1c3094f..c7da377302 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components;
 
 import java.util.Iterator;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.Panel;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java
index 9cddbeb28b..2d8cfd6831 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java
@@ -3,11 +3,11 @@ package com.vaadin.tests.components;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.CompositeErrorMessage;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ErrorMessages extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java
index 645a376a9a..544d7b1446 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java
@@ -6,10 +6,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.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.DateField;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java
index 59e79c96b5..8e330c29cd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java
@@ -4,9 +4,9 @@ import java.util.Arrays;
 
 import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.event.ShortcutAction.ModifierKey;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Select;
 
 public class FocusFromShortcutAction extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/MultipleDebugIds.java b/uitest/src/main/java/com/vaadin/tests/components/MultipleDebugIds.java
index 620a296b72..a75f8ab06f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/MultipleDebugIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/MultipleDebugIds.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Button;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class MultipleDebugIds extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java
index 6cef8b7605..1be0bd63a2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java
@@ -4,11 +4,11 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 import com.vaadin.annotations.Viewport;
-import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter;
-import com.vaadin.legacy.data.validator.LegacyIntegerRangeValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
+import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @Viewport(value = "width=device-width,height=device-height")
 public class TouchDevicesTooltip extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
index da171ffc99..2c70619f0a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.components.absolutelayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
@@ -23,6 +22,7 @@ import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
index 83548141e5..eb3ffcc8b7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
@@ -15,11 +15,11 @@
  */
 package com.vaadin.tests.components.abstractcomponent;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 
 public class PrimaryStyle extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
index ea41be4789..0750469b22 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
@@ -8,12 +8,12 @@ import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Component;
+import com.vaadin.v7.ui.LegacyAbstractField;
 
 public abstract class AbstractComponentDataBindingTest extends TestBase
         implements ValueChangeListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
index e243fcec30..5ac36b4275 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.components.abstractfield;
 
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.data.validator.LegacyStringLengthValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Notification;
 
 public class AbstractFieldCommitWithInvalidValues extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
index b66a119527..36b9476a38 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.abstractfield;
 
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component.Event;
 import com.vaadin.ui.Component.Listener;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class AbstractFieldDataSourceReadOnly extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
index 0533b7c02a..1c0f29f381 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.abstractfield;
 
-import com.vaadin.legacy.ui.LegacyDateField;
+import com.vaadin.v7.ui.LegacyDateField;
 
 public class DateFieldBackedByString extends AbstractComponentDataBindingTest {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
index ebe87fdb4b..63e2c67516 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.abstractfield;
 import java.util.Date;
 
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyPopupDateField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyPopupDateField;
 
 public class DateFieldBasedOnLong extends AbstractComponentDataBindingTest {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
index 2f25bf8ce2..675e170e59 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.abstractfield;
 
 import com.vaadin.data.util.MethodProperty;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.data.bean.Address;
 import com.vaadin.tests.data.bean.Country;
 import com.vaadin.tests.data.bean.Person;
 import com.vaadin.tests.data.bean.Sex;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class DoubleInTextField extends AbstractComponentDataBindingTest {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
index c30edc1bf6..71937c871e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
@@ -2,12 +2,12 @@ package com.vaadin.tests.components.abstractfield;
 
 import java.util.Arrays;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class FieldFocusOnClick extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
index 1a5607722f..7676b5a11a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
@@ -3,11 +3,11 @@ package com.vaadin.tests.components.abstractfield;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.data.validator.LegacyDoubleValidator;
-import com.vaadin.legacy.data.validator.LegacyIntegerValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
+import com.vaadin.v7.data.validator.LegacyDoubleValidator;
+import com.vaadin.v7.data.validator.LegacyIntegerValidator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class IntegerDoubleFieldsWithDataSource extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
index 9a0766f2a0..5c53177e94 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.components.abstractfield;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class IntegerFieldWithoutDataSource extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java
index 795465bb88..65c267b3fb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java
@@ -13,10 +13,10 @@ import com.vaadin.data.Property;
 import com.vaadin.data.Property.ReadOnlyStatusChangeEvent;
 import com.vaadin.data.Property.ReadOnlyStatusChangeListener;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.tests.components.AbstractComponentTest;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.MenuItem;
+import com.vaadin.v7.ui.LegacyAbstractField;
 
 public abstract class LegacyAbstractFieldTest<T extends LegacyAbstractField>
         extends AbstractComponentTest<T>
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java
index 437afd54e6..f8031c4d65 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java
@@ -6,8 +6,8 @@ import java.util.List;
 
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.legacy.ui.LegacyAbstractTextField;
-import com.vaadin.legacy.ui.LegacyAbstractTextField.TextChangeEventMode;
+import com.vaadin.v7.ui.LegacyAbstractTextField;
+import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
 
 public abstract class LegacyAbstractTextFieldTest<T extends LegacyAbstractTextField>
         extends LegacyAbstractFieldTest<T> implements TextChangeListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
index 9927322b64..f14091b2c7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
@@ -3,8 +3,6 @@ package com.vaadin.tests.components.abstractfield;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.vaadin.legacy.ui.LegacyField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbsoluteLayout;
@@ -16,6 +14,8 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class RequiredIndicatorForFieldsWithoutCaption extends AbstractTestUI {
     private Set<LegacyField> fields = new HashSet<LegacyField>();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/TextFieldConversions.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
index ce6a58a5de..899d62d72d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
@@ -5,11 +5,11 @@ import java.util.Date;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ErrorEvent;
 import com.vaadin.server.ErrorHandler;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TextFieldConversions extends AbstractComponentDataBindingTest {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
index 4af04293cf..0fcfa9087f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.abstractfield;
 
 import java.util.Locale;
 
-import com.vaadin.legacy.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.util.converter.LegacyConverter;
 
 public class Vaadin6ImplicitDoubleConverter
         implements LegacyConverter<String, Double> {
@@ -10,7 +10,7 @@ public class Vaadin6ImplicitDoubleConverter
     @Override
     public Double convertToModel(String value,
             Class<? extends Double> targetType, Locale locale)
-            throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException {
+            throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
         if (null == value) {
             return null;
         }
@@ -20,7 +20,7 @@ public class Vaadin6ImplicitDoubleConverter
     @Override
     public String convertToPresentation(Double value,
             Class<? extends String> targetType, Locale locale)
-            throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException {
+            throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
         if (value == null) {
             return null;
         }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
index ae8ab9a7bb..f1e1f72bec 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.accordion;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.TabSheet.Tab;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class AccordionInactiveTabSize extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java
index 46fe1984e7..48c12d5047 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java
@@ -15,10 +15,10 @@
  */
 package com.vaadin.tests.components.button;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.NativeButton;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ButtonTabIndex extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
index 311cfa2939..51fe9cee22 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
@@ -24,8 +24,6 @@ import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.util.BeanItemContainer;
 import com.vaadin.event.Action;
-import com.vaadin.legacy.ui.LegacyDateField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.Calendar;
@@ -37,6 +35,8 @@ import com.vaadin.ui.Window;
 import com.vaadin.ui.Window.CloseEvent;
 import com.vaadin.ui.components.calendar.ContainerEventProvider;
 import com.vaadin.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class BeanItemContainerTestUI extends UI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
index 1b38aa08a0..1acc62a5e7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
@@ -30,8 +30,6 @@ import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.ui.LegacyDateField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.combobox.FilteringMode;
@@ -65,6 +63,8 @@ import com.vaadin.ui.components.calendar.event.BasicEventProvider;
 import com.vaadin.ui.components.calendar.event.CalendarEvent;
 import com.vaadin.ui.components.calendar.handler.BasicDateClickHandler;
 import com.vaadin.ui.components.calendar.handler.BasicWeekClickHandler;
+import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /** Calendar component test application */
 @Theme("tests-calendar")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/caption/EmptyCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/caption/EmptyCaptions.java
index 71529fb546..5c954f397d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/caption/EmptyCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/caption/EmptyCaptions.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.caption;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.UserError;
 import com.vaadin.tests.components.TestBase;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class EmptyCaptions extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java
index 07f56b807b..2c68f5741e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.combobox;
 
 import com.vaadin.data.Property;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ComboBoxSelecting extends AbstractTestUI {
     protected ComboBox comboBox;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java
index 04f4eb91d7..b882a58354 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java
@@ -17,11 +17,11 @@ package com.vaadin.tests.components.combobox;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * A test case for typing in combo box input field fast plus then press TAB.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
index bd15b377b9..4dbd69f000 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
@@ -4,9 +4,9 @@ import java.util.Arrays;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Select;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ComboBoxTextFieldEventOrder extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
index 4efff5ec9c..3fdee9d579 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
@@ -7,11 +7,11 @@ import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.FocusEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ComboFocusBlurEvents extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
index 36cb6e017e..cf91425ec0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
@@ -10,13 +10,13 @@ import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.FocusEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.ProgressIndicator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ComboPushTiming extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java
index 0220617991..95664ba7d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.components.customcomponent;
 
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ClipContent extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java
index f8897c9f4b..efc842c767 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java
@@ -15,12 +15,12 @@
  */
 package com.vaadin.tests.components.customfield;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CustomField;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  *
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java
index c62df573f1..e63e87b33d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java
@@ -4,10 +4,10 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomLayout;
 
 public class CustomLayoutPrimaryStyleName extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
index 318db6b18b..5c57daa75d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
@@ -3,11 +3,11 @@ package com.vaadin.tests.components.customlayout;
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.Label;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
index 18bf589452..5c0adfdece 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.customlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.NativeButton;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
index 9552008e0e..f6adf5ea38 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
@@ -18,12 +18,12 @@ package com.vaadin.tests.components.customlayout;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomLayout;
 
 public class CustomLayoutWithMissingSlot extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
index 1bb2625807..e96866607d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
@@ -7,7 +7,6 @@ import java.util.Locale;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyPopupDateField;
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
@@ -15,6 +14,7 @@ import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyPopupDateField;
 import com.vaadin.ui.Label;
 
 @SuppressWarnings("serial")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
index 93c5997405..17e6d850ff 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
@@ -5,12 +5,12 @@ import java.util.Locale;
 
 import com.vaadin.data.HasValue;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.data.validator.LegacyRangeValidator;
-import com.vaadin.legacy.ui.LegacyPopupDateField;
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.CheckBoxWithPropertyDataSource;
 import com.vaadin.ui.CheckBox;
+import com.vaadin.v7.data.validator.LegacyRangeValidator;
+import com.vaadin.v7.ui.LegacyPopupDateField;
 
 public class DateFieldRangeValidation extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
index 491348cbcb..e05e132517 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.datefield;
 import java.util.Date;
 
 import com.vaadin.data.Result;
-import com.vaadin.legacy.data.util.converter.LegacyConverter;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
+import com.vaadin.v7.data.util.converter.LegacyConverter;
 
 public class DateFieldUnparsableDate extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
index 272c29375b..daffdf5e05 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.components.datefield;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.data.validator.LegacyNullValidator;
-import com.vaadin.legacy.ui.LegacyDateField;
 import com.vaadin.tests.components.TestBase;
+import com.vaadin.v7.data.validator.LegacyNullValidator;
+import com.vaadin.v7.ui.LegacyDateField;
 
 @SuppressWarnings("serial")
 public class DefaultHandleUnparsableDateField extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValid.java
index 3a1311cd6e..1bac7a766e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValid.java
@@ -5,11 +5,11 @@ import java.util.Date;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyDateField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyDateField;
 
 public class LegacyDateFieldIsValid extends AbstractTestUIWithLog {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java
index 37cb46edea..55d8e779d0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java
@@ -6,14 +6,14 @@ import java.util.Locale;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyDateField;
-import com.vaadin.legacy.ui.LegacyInlineDateField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.LegacyInlineDateField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java
index e89d911806..5eb3d5c5b1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java
@@ -7,9 +7,9 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 
-import com.vaadin.legacy.ui.LegacyDateField;
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
+import com.vaadin.v7.ui.LegacyDateField;
 
 public class LegacyDateFieldTest<T extends LegacyDateField>
         extends LegacyAbstractFieldTest<T> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java
index 9d3ef0e76b..f1d16d9cbb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.datefield;
 
-import com.vaadin.legacy.ui.LegacyInlineDateField;
+import com.vaadin.v7.ui.LegacyInlineDateField;
 
 public class LegacyInlineDateFieldTest
         extends LegacyDateFieldTest<LegacyInlineDateField> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java
index 1f0dd76eef..c7c22c9636 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.datefield;
 
 import java.util.LinkedHashMap;
 
-import com.vaadin.legacy.ui.LegacyPopupDateField;
+import com.vaadin.v7.ui.LegacyPopupDateField;
 
 public class LegacyPopupDateFieldTest
         extends LegacyDateFieldTest<LegacyPopupDateField> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
index c8d05bc5e5..d2d9d30a5e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
@@ -5,10 +5,10 @@ import java.util.Locale;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.data.validator.LegacyAbstractValidator;
-import com.vaadin.legacy.ui.LegacyDateField;
 import com.vaadin.tests.components.TestBase;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.data.validator.LegacyAbstractValidator;
+import com.vaadin.v7.ui.LegacyDateField;
 
 public class RequiredInvalidDateField extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java
index fd515e5883..a014f9ef6b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java
@@ -6,13 +6,13 @@ import java.util.Locale;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyDateField;
-import com.vaadin.legacy.ui.LegacyPopupDateField;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.LegacyPopupDateField;
 import com.vaadin.ui.Label;
 
 public class ValueThroughProperty extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
index 3e7fa43193..b13f6539bb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
@@ -23,12 +23,12 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
-import com.vaadin.legacy.ui.LegacyAbstractField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
+import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.VerticalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java
index e08ed9d461..37ea2c2109 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.components.formlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
@@ -8,6 +7,7 @@ import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.NativeSelect;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class CaptionEnableDisable extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
index 81528e81bb..c66a7d9f32 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.formlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.FormLayout;
 
 public class FormLayoutCaptionStyles extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
index 738f4d7318..4c7d95bd19 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
@@ -16,13 +16,13 @@
 package com.vaadin.tests.components.formlayout;
 
 import com.vaadin.annotations.Theme;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Test UI for H2 label inside FormLayout.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
index 06a15d77c2..d86d574647 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
@@ -15,11 +15,11 @@
  */
 package com.vaadin.tests.components.formlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.FormLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
index 1f6c911d9d..6ad4a90c41 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
@@ -15,11 +15,11 @@
  */
 package com.vaadin.tests.components.formlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.FormLayout;
 
 public class HtmlCaptionInFormLayout extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
index 602e0439bf..f02a66474b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.formlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TableInFormLayoutCausesScrolling extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java
index 746aef1962..57a020c828 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java
@@ -15,12 +15,12 @@
  */
 package com.vaadin.tests.components.grid;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.PersonContainer;
 import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.PasswordField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class GridEditorUI extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java
index 953b531a0d..0cc829117b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java
@@ -24,7 +24,6 @@ import com.vaadin.annotations.Theme;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.legacy.data.validator.LegacyIntegerRangeValidator;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.tests.fieldgroup.ComplexPerson;
@@ -36,6 +35,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.renderers.DateRenderer;
+import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
 
 @Theme("valo")
 public class GridThemeUI extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
index b3d556e08f..dd69a98173 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
@@ -17,12 +17,12 @@ package com.vaadin.tests.components.grid;
 
 import java.util.Collection;
 
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.data.Validator.InvalidValueException;
-import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.data.Validator.InvalidValueException;
+import com.vaadin.v7.ui.LegacyField;
 import com.vaadin.ui.Label;
 
 public class GridWithLabelEditor extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
index 9f22dbc46e..90e4cb9bfe 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
@@ -43,7 +43,6 @@ import com.vaadin.event.SelectionEvent;
 import com.vaadin.event.SelectionEvent.SelectionListener;
 import com.vaadin.event.SortEvent;
 import com.vaadin.event.SortEvent.SortListener;
-import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.shared.ui.grid.GridStaticCellType;
 import com.vaadin.shared.ui.grid.HeightMode;
@@ -80,6 +79,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.renderers.DateRenderer;
 import com.vaadin.ui.renderers.HtmlRenderer;
 import com.vaadin.ui.renderers.NumberRenderer;
+import com.vaadin.v7.ui.LegacyField;
 
 /**
  * Tests the basic features like columns, footers and headers
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
index 6841627050..dec4a761a7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
@@ -15,11 +15,11 @@
  */
 package com.vaadin.tests.components.gridlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.GridLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class GridLayoutCaptionAlignment extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java
index a6f2069891..a033023dca 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java
@@ -15,13 +15,13 @@
  */
 package com.vaadin.tests.components.gridlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Test for grid required indicator location within slots.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
index 51f864918a..5a1a8e42d8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.components.gridlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @SuppressWarnings("serial")
 public class UniformGridLayoutUI extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
index 0dcc9b5518..ce61654d96 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
@@ -16,7 +16,6 @@
 
 package com.vaadin.tests.components.layout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.Page;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
@@ -24,6 +23,7 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class EmptySpaceOnPageAfterExpandedComponent extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
index aa4605d9e5..7dd068b8f8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.notification;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.Page;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.TextArea;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
index 499dc83781..63322167fc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
@@ -9,8 +9,6 @@ import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
-import com.vaadin.legacy.ui.LegacyAbstractField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.server.VaadinRequest;
@@ -29,6 +27,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @Theme("tests-components")
 @PreserveOnRefresh
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
index ec3c5f82bb..cddb5a5ff2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.components.orderedlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
@@ -9,6 +8,7 @@ import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * HorizontalLayout and VerticalLayout should not leak caption elements via
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
index 73c7b7d515..3889883d67 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
@@ -19,11 +19,11 @@
  */
 package com.vaadin.tests.components.orderedlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ErrorIndicator extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
index 266cb41d63..5899f1ac0a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.components.orderedlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.UserError;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
@@ -8,6 +7,7 @@ import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalLayout;
 
 public class HorizontalLayoutFullsizeContentWithErrorMsg
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
index 61c09e4a92..8fe684cba1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
@@ -4,7 +4,6 @@ import java.util.Arrays;
 
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
@@ -14,6 +13,7 @@ import com.vaadin.ui.Link;
 import com.vaadin.ui.Select;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class LayoutClickListenerTest extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
index 3245335bbe..874e40b5be 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
@@ -19,11 +19,11 @@
  */
 package com.vaadin.tests.components.orderedlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TooltipOnRequiredIndicator extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
index b32d9c75bb..7aad8a2f8b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
@@ -17,11 +17,11 @@ package com.vaadin.tests.components.orderedlayout;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class VerticalLayoutFocusWithDOMChanges extends AbstractTestUI
         implements ValueChangeListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
index 0da587586d..2f92533f32 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.orderedlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
index 677df3e8b9..4205704666 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.components.orderedlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.Sizeable;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
@@ -15,6 +14,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class VerticalLayoutWithEmptyLabel extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
index bc9de8bd64..283d9b0ff1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
@@ -7,10 +7,10 @@ import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ShortcutAction;
 import com.vaadin.event.ShortcutAction.ModifierKey;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
index 57a93b9c5d..e4109f6c43 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.components.panel;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.CheckBox;
@@ -23,6 +22,7 @@ import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class UndefinedSizeScrollbars extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java
index 2270da827c..8ad32f8ce7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.popupview;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.PopupView;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
index a8f56051e6..f317c44cf5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
@@ -17,12 +17,12 @@ package com.vaadin.tests.components.popupview;
 
 import com.vaadin.event.ShortcutAction;
 import com.vaadin.event.ShortcutListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.PopupView;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Test UI to check availability of shortcut action listener in the popup view
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
index 4bbbc63644..218a94c3ac 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.popupview;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.PopupView;
 import com.vaadin.ui.PopupView.Content;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.VerticalLayout;
 
 @SuppressWarnings("serial")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
index 23cd36b248..a4aceadbc0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
@@ -2,7 +2,6 @@ package com.vaadin.tests.components.richtextarea;
 
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
-import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.event.ShortcutAction;
 import com.vaadin.server.Page;
 import com.vaadin.tests.components.TestBase;
@@ -12,6 +11,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.RichTextArea;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyAbstractField;
 
 @SuppressWarnings("serial")
 public class RichTextAreaWithKeyboardShortcuts extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
index 1370a342f0..f6da858ca7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.components.splitpanel;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
@@ -8,6 +7,7 @@ import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class SplitPanelWidthOnResize extends AbstractTestCase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ClippedComponentsInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/ClippedComponentsInTable.java
index 7d74e15b4c..54a68ce998 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ClippedComponentsInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ClippedComponentsInTable.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.table;
 
 import com.vaadin.data.Item;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ClippedComponentsInTable extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DoublesInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/DoublesInTable.java
index 7cc9b8cd88..c0abdfb55b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/DoublesInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DoublesInTable.java
@@ -8,8 +8,6 @@ import java.util.Locale;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.legacy.data.util.converter.LegacyConverter;
-import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.data.bean.Address;
 import com.vaadin.tests.data.bean.Country;
@@ -19,6 +17,8 @@ import com.vaadin.tests.util.Log;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter;
 
 public class DoublesInTable extends TestBase {
     BeanItemContainer<Person> personBeanItemContainer = new BeanItemContainer<Person>(
@@ -140,7 +140,7 @@ public class DoublesInTable extends TestBase {
             @Override
             public Sex convertToModel(String value,
                     Class<? extends Sex> targetType, Locale locale)
-                    throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException {
+                    throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
                 // not used in this test - Table only converts to presentation
                 return null;
             }
@@ -148,7 +148,7 @@ public class DoublesInTable extends TestBase {
             @Override
             public String convertToPresentation(Sex value,
                     Class<? extends String> targetType, Locale locale)
-                    throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException {
+                    throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
                 if (value == null) {
                     value = Sex.UNKNOWN;
                 }
@@ -200,7 +200,7 @@ public class DoublesInTable extends TestBase {
             @Override
             public Integer convertToModel(String value,
                     Class<? extends Integer> targetType, Locale locale)
-                    throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException {
+                    throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
                 // not used in this test - Table only converts from source to
                 // target
                 return null;
@@ -209,7 +209,7 @@ public class DoublesInTable extends TestBase {
             @Override
             public String convertToPresentation(Integer value,
                     Class<? extends String> targetType, Locale locale)
-                    throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException {
+                    throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
                 if (value == null) {
                     return null;
                 }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
index 0241684a99..bc51e1f051 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
@@ -7,13 +7,13 @@ import java.util.Locale;
 
 import com.vaadin.data.Container;
 import com.vaadin.event.ItemClickEvent;
-import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.DefaultFieldFactory;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.TableFieldFactory;
+import com.vaadin.v7.ui.LegacyField;
 
 public class EditableModeChange extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java
index 3994029b43..5d184d66af 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java
@@ -7,13 +7,13 @@ import java.io.Serializable;
 import java.util.HashMap;
 
 import com.vaadin.data.Container;
-import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.DefaultFieldFactory;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HugeRowCount.java b/uitest/src/main/java/com/vaadin/tests/components/table/HugeRowCount.java
index b761549edf..149d788fd0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HugeRowCount.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HugeRowCount.java
@@ -4,10 +4,10 @@ import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class HugeRowCount extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
index de160182a9..aee373d8f0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
@@ -5,7 +5,6 @@ import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractSelect.NewItemHandler;
 import com.vaadin.ui.Button;
@@ -15,6 +14,7 @@ import com.vaadin.ui.DefaultFieldFactory;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.ColumnGenerator;
+import com.vaadin.v7.ui.LegacyField;
 import com.vaadin.ui.TableFieldFactory;
 
 public class PropertyValueChange extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java
index 324c2ad527..5c39cc5695 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractOrderedLayout;
@@ -11,6 +10,7 @@ import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HasChildMeasurementHint.ChildMeasurementHint;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
index 3a1795c4f0..80b4ba26c3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
@@ -7,7 +7,6 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.Resource;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.VaadinRequest;
@@ -20,6 +19,7 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.ColumnGenerator;
 import com.vaadin.ui.Table.RowHeaderMode;
 import com.vaadin.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TableClickAndDragOnIconAndComponents extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
index e18645973d..547a164bb7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.ColumnGenerator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TableColumnResizeContentsWidth extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java
index eb496c2438..ea2dccf1df 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java
@@ -3,13 +3,13 @@ package com.vaadin.tests.components.table;
 import com.vaadin.event.Action;
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TableContextMenuOnField extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
index a480037e98..f0e4b8de7a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.components.table;
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractSelect.ItemDescriptionGenerator;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java
index f2e0e2b961..68480788c1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java
@@ -21,13 +21,13 @@ 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.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Test for ensuring page doesn't jump up to the Table selection on IE with
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableLastRowMissing.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableLastRowMissing.java
index 3a453ed35a..453424606a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableLastRowMissing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableLastRowMissing.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.table;
 
 import com.vaadin.data.Item;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TableLastRowMissing extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java
index 16f3ea3bc3..2ab23f6b9f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.table;
 
 import com.vaadin.data.util.MethodProperty;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
index 7da9b0e65b..8ab3ea745c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
@@ -17,12 +17,12 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Test to see if Table appears to scroll up under an obscure set of conditions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
index 5fdb4af257..ead6d3d17d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TableShouldNotEatValueChanges extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java
index ebb5f16372..8bcb7e0485 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java
@@ -5,13 +5,13 @@ import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.DefaultFieldFactory;
 import com.vaadin.ui.Table;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
index 7ca9d1b236..ed6144cae7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
@@ -17,11 +17,11 @@ package com.vaadin.tests.components.table;
 
 import java.util.Locale;
 
-import com.vaadin.legacy.data.util.converter.LegacyConverter;
-import com.vaadin.legacy.data.util.converter.LegacyDefaultConverterFactory;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.util.converter.LegacyDefaultConverterFactory;
 
 public class TableWithCustomConverterFactory extends AbstractTestUI {
 
@@ -31,7 +31,7 @@ public class TableWithCustomConverterFactory extends AbstractTestUI {
         @Override
         public Integer convertToModel(String value,
                 Class<? extends Integer> targetType, Locale locale)
-                throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException {
+                throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
             // TODO Auto-generated method stub
             return null;
         }
@@ -39,7 +39,7 @@ public class TableWithCustomConverterFactory extends AbstractTestUI {
         @Override
         public String convertToPresentation(Integer value,
                 Class<? extends String> targetType, Locale locale)
-                throws com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException {
+                throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
             return "Integer: " + value;
         }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
index 1a41a9c8d8..d13a75c4f4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Table;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
index 0cb2d72e99..019e94a938 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.components.tabsheet;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @SuppressWarnings("serial")
 public class ScrollbarsInNestedTabsheets extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
index 4cd9cc23a6..446c993278 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
@@ -6,7 +6,6 @@ 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.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.Log;
@@ -18,6 +17,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TabSheet.Tab;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.VerticalLayout;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java
index 7770258aba..f02f5823d2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java
@@ -2,7 +2,6 @@ package com.vaadin.tests.components.tabsheet;
 
 import java.util.ArrayList;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
@@ -12,6 +11,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TabSheet.Tab;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.VerticalLayout;
 
 public class TabKeyboardNavigationWaiAria extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
index 1c506c6bb4..1ba991d1cb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.tabsheet;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
index 50050b9a36..92d6591424 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.tabsheet;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TabSheetIcons extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
index 95ba3f1baf..8f6e9f8c50 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.tabsheet;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
index db6aa01281..b5496832ce 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
@@ -2,14 +2,14 @@ package com.vaadin.tests.components.textarea;
 
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.legacy.ui.LegacyAbstractTextField;
-import com.vaadin.legacy.ui.LegacyAbstractField;
-import com.vaadin.legacy.ui.LegacyTextField;
-import com.vaadin.legacy.ui.LegacyAbstractTextField.TextChangeEventMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.v7.ui.LegacyAbstractTextField;
+import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
 
 public class TextAreaCursorPosition extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java
index e7635bd5c6..de4bbd4788 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java
@@ -17,12 +17,12 @@ package com.vaadin.tests.components.textfield;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java
index 4a98e1df59..cba8058418 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java
@@ -21,12 +21,12 @@ import java.util.Locale;
 
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.VerticalLayout;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
index 8cb0076038..777ed5c052 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
@@ -4,9 +4,9 @@ import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.event.Action;
 import com.vaadin.event.ShortcutAction;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class EnterShortcutMaySendInputPromptAsValue extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java
index b39f5e5982..cb5e72c444 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java
@@ -18,9 +18,9 @@ package com.vaadin.tests.components.textfield;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class EnumTextField extends AbstractTestUIWithLog {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/IE6Cursor.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/IE6Cursor.java
index cca6e2378c..7c85a632cd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/IE6Cursor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/IE6Cursor.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.textfield;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class IE6Cursor extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java
index b913ac6836..f8d2c9e235 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java
@@ -17,12 +17,12 @@ package com.vaadin.tests.components.textfield;
 
 import com.vaadin.annotations.Theme;
 import com.vaadin.event.ShortcutAction.KeyCode;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.event.ShortcutListener;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java
index d3566ff23a..874a7d9645 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.textfield;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
+import com.vaadin.v7.ui.LegacyTextField;
 
 import java.math.BigDecimal;
 import java.util.Locale;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java
index a35aa9969e..56b9840e27 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java
@@ -15,12 +15,12 @@
  */
 package com.vaadin.tests.components.textfield;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Test for required text field.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/SizedTextFields.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/SizedTextFields.java
index 9c253720a2..bcdbae5a03 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/SizedTextFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/SizedTextFields.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.textfield;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class SizedTextFields extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
index 0f13f5f92d..bfb46ae1d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
@@ -8,11 +8,11 @@ import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
-import com.vaadin.legacy.ui.LegacyAbstractTextField.TextChangeEventMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
 
 public class TextChangeEvents2 extends TestBase {
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
index 9ea1421095..edb26da892 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
@@ -4,9 +4,9 @@ import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TextChangeEventsWithNonImmediateValueChange extends TestBase {
     Log l = new Log(5);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
index 77858e8f9e..5af2103be1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components.textfield;
 
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
-import com.vaadin.legacy.ui.LegacyAbstractTextField.TextChangeEventMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.TestUtils;
+import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
 
 public class TextChangeListenerChangingNonTextProperties extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
index 26f1c9e013..b971613c09 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
@@ -18,12 +18,12 @@ package com.vaadin.tests.components.textfield;
 
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.legacy.ui.LegacyAbstractTextField;
-import com.vaadin.legacy.ui.LegacyField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.LegacyAbstractTextField;
+import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TextChangeListenerLosesFocus extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
index 1483207c43..ecbc6f535a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.components.textfield;
 
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
-import com.vaadin.legacy.ui.LegacyAbstractTextField.TextChangeEventMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
 import com.vaadin.ui.Label;
 
 public class TextChangeTimeoutAfterDetach extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
index f286f749ad..c638bbc1c9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.components.textfield;
 
 import com.vaadin.event.FieldEvents.TextChangeEvent;
 import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
-import com.vaadin.legacy.ui.LegacyAbstractTextField.TextChangeEventMode;
 import com.vaadin.tests.components.TestBase;
+import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
 
 public class TextFieldEagerRepaint extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
index e8bfc639ae..2439819efc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.textfield;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TextFieldInLayoutInTable extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
index 827941c0c6..5a043e6303 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.components.textfield;
 
 import com.vaadin.event.ShortcutAction.KeyCode;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 
 public class TextFieldInputPromptAndClickShortcut extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java
index 542e2c479b..02c4d47ded 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.textfield;
 
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.FocusEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TextFieldMaxLengthRemovedFromDOM extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java
index 094dfbb3a5..05301650d2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.textfield;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TextFieldPrimaryStyleName extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
index 71303c4209..db4775fcf1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.textfield;
 
 import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TextFieldTest extends LegacyAbstractTextFieldTest<LegacyTextField>
         implements TextChangeListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
index d7518eea95..84c2e8c8e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
@@ -16,9 +16,9 @@
 package com.vaadin.tests.components.textfield;
 
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TextFieldWithDataSourceAndInputPrompt extends AbstractTestUI {
     public static class Pojo {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithProperty.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
index cbff3b7c4e..7a0adf9968 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.textfield;
 
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @SuppressWarnings("unchecked")
 public class TextFieldWithProperty extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
index c7f386a8ae..73cab19c95 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
@@ -7,11 +7,11 @@ import java.util.Locale;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.PropertyFormatter;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TextFieldWithPropertyFormatter extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
index 1d4845b5dc..73b3d6d114 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.components.tree;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.event.ItemClickEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @SuppressWarnings("serial")
 public class TreeFocusGaining extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java
index 3a4d6680cf..9d56a1cbbf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.tree;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.RichTextArea;
 import com.vaadin.ui.Tree;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TreeScrolling extends AbstractTestCase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
index 01bf8abd53..0ff5d125f8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
@@ -2,12 +2,12 @@ package com.vaadin.tests.components.ui;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.NativeButton;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java
index da2f1d8b34..002b372912 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java
@@ -18,10 +18,10 @@ package com.vaadin.tests.components.ui;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.MethodProperty;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.tests.util.Log;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class UIPolling extends AbstractTestUIWithLog {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java
index 37168a6033..4b08f7ac64 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java
@@ -2,13 +2,13 @@ package com.vaadin.tests.components.uitest;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.Page.UriFragmentChangedEvent;
 import com.vaadin.server.Page.UriFragmentChangedListener;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java
index e688cbf5a1..67c37ba474 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.uitest;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalLayout;
 
 public class ThemeTestUI extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
index a1e649884c..9b7bf457d9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.components.uitest.components;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.uitest.TestSampler;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
@@ -9,6 +8,7 @@ import com.vaadin.ui.RichTextArea;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.themes.ChameleonTheme;
 import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TextFieldsCssTest extends GridLayout {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/ForceSubmit.java b/uitest/src/main/java/com/vaadin/tests/components/upload/ForceSubmit.java
index c5e4ea559a..57874c2d41 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/ForceSubmit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/ForceSubmit.java
@@ -3,7 +3,6 @@ package com.vaadin.tests.components.upload;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -13,6 +12,7 @@ import com.vaadin.ui.Upload.FailedEvent;
 import com.vaadin.ui.Upload.FinishedEvent;
 import com.vaadin.ui.Upload.Receiver;
 import com.vaadin.ui.Upload.StartedEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ForceSubmit extends TestBase implements Receiver {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java
index efea510999..1ddaf288fd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components.window;
 
 import com.vaadin.event.Action;
 import com.vaadin.event.ShortcutAction;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
index 57f1d5645d..1a36959afb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
@@ -7,10 +7,10 @@ import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.event.ShortcutAction;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.UI;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java
index cf8bfd4dfb..13244317d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.window;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
index a86475dadd..03ba4b29c5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
@@ -7,12 +7,12 @@ import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ShortcutAction;
 import com.vaadin.event.ShortcutAction.ModifierKey;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
index 7e23b2f8d2..787f917afd 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.containers;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
index 85694bfeba..032bf422ee 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.containers;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
diff --git a/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java b/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
index f640061a6f..6d450d5db0 100644
--- a/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
+++ b/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
@@ -4,9 +4,9 @@ import java.util.Locale;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ConverterThatEnforcesAFormat extends AbstractTestUIWithLog {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java b/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
index f6eee3cbc0..ccf08a7fc7 100644
--- a/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
+++ b/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.converter;
 import java.text.NumberFormat;
 import java.util.Locale;
 
-import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter;
+import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter;
 
 public class StringToDoubleConverterWithThreeFractionDigits
         extends LegacyStringToDoubleConverter {
diff --git a/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java b/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java
index cc1aa492cb..d4e726e298 100644
--- a/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java
@@ -17,12 +17,12 @@ package com.vaadin.tests.declarative;
 
 import com.vaadin.annotations.DesignRoot;
 import com.vaadin.data.fieldgroup.PropertyId;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.PopupDateField;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.declarative.Design;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @DesignRoot
 public class PotusForm extends VerticalLayout {
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
index 8a7e68e96d..16851994db 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
@@ -26,10 +26,6 @@ import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.data.fieldgroup.PropertyId;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.legacy.data.Validator.InvalidValueException;
-import com.vaadin.legacy.data.validator.LegacyIntegerRangeValidator;
-import com.vaadin.legacy.ui.LegacyField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.shared.util.SharedUtil;
@@ -47,6 +43,10 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.Notification.Type;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.data.Validator.InvalidValueException;
+import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
+import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @Theme("valo")
 public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
@@ -202,7 +202,7 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
                 ComplexPerson.class) {
             @Override
             protected void configureField(
-                    com.vaadin.legacy.ui.LegacyField<?> field) {
+                    com.vaadin.v7.ui.LegacyField<?> field) {
                 super.configureField(field);
                 if (field.getCaption().equals("Postal code")) {
                     // Last name editing is disabled through property.
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
index 6a02cf6f0f..51897e0f14 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
@@ -22,10 +22,10 @@ import com.vaadin.data.Item;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.event.SelectionEvent;
 import com.vaadin.event.SelectionEvent.SelectionListener;
-import com.vaadin.legacy.data.validator.LegacyIntegerRangeValidator;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.renderers.DateRenderer;
+import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
 
 public class BasicCrudGridEditorRow extends AbstractBasicCrud {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java
index da4c9b4d0b..92b207cefc 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java
@@ -6,11 +6,6 @@ import com.vaadin.data.fieldgroup.FieldGroup.CommitEvent;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitHandler;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.data.util.converter.LegacyStringToBooleanConverter;
-import com.vaadin.legacy.data.validator.LegacyEmailValidator;
-import com.vaadin.legacy.data.validator.LegacyIntegerRangeValidator;
-import com.vaadin.legacy.data.validator.LegacyStringLengthValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.tests.data.bean.Address;
@@ -19,6 +14,11 @@ import com.vaadin.tests.data.bean.Person;
 import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.data.util.converter.LegacyStringToBooleanConverter;
+import com.vaadin.v7.data.validator.LegacyEmailValidator;
+import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
+import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.Notification;
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java
index d4e91c9d02..48c258069a 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java
@@ -8,15 +8,15 @@ import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.data.fieldgroup.PropertyId;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.ui.LegacyDateField;
-import com.vaadin.legacy.ui.LegacyInlineDateField;
-import com.vaadin.legacy.ui.LegacyPopupDateField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.tests.data.bean.Person;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.LegacyInlineDateField;
+import com.vaadin.v7.ui.LegacyPopupDateField;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Notification;
 
 public class DateForm extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
index 96d5c120e4..ea60132e1d 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
@@ -4,7 +4,6 @@ import com.vaadin.data.fieldgroup.BeanFieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.data.bean.Address;
 import com.vaadin.tests.data.bean.Country;
@@ -13,6 +12,7 @@ import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.TextArea;
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
index 87bc806a06..46d92edbf3 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
@@ -4,12 +4,12 @@ import com.vaadin.data.fieldgroup.BeanFieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.PropertyId;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.data.bean.Address;
 import com.vaadin.tests.data.bean.Country;
 import com.vaadin.tests.data.bean.Person;
 import com.vaadin.tests.data.bean.Sex;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class FormBuilderWithNestedProperties extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
index 097bde900f..77b6a667f0 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
@@ -2,7 +2,6 @@ package com.vaadin.tests.fieldgroup;
 
 import com.vaadin.data.fieldgroup.BeanFieldGroup;
 import com.vaadin.data.fieldgroup.PropertyId;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.data.bean.Address;
 import com.vaadin.tests.data.bean.Country;
 import com.vaadin.tests.data.bean.Person;
@@ -10,6 +9,7 @@ import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.NativeSelect;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class FormWithNestedProperties extends AbstractBeanFieldGroupTest {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
index 2e3ed4b334..2aed28e0ec 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
@@ -4,14 +4,14 @@ import org.apache.commons.lang.StringEscapeUtils;
 
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.data.validator.LegacyBeanValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.AbstractErrorMessage;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.data.validator.LegacyBeanValidator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class MultipleValidationErrors extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java b/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java
index 7ce973f582..75a9b8977e 100644
--- a/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java
+++ b/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java
@@ -3,12 +3,12 @@ package com.vaadin.tests.fields;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Component;
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
index 0c7e26861d..72aea19ce1 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
@@ -21,7 +21,6 @@ import javax.portlet.ResourceResponse;
 import javax.portlet.WindowState;
 
 import com.vaadin.annotations.StyleSheet;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.VaadinPortletRequest;
 import com.vaadin.server.VaadinPortletService;
@@ -37,6 +36,7 @@ import com.vaadin.ui.Notification.Type;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.Upload.Receiver;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.VerticalLayout;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
index e823624fe6..dd0aba5897 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
@@ -6,8 +6,6 @@ import java.util.List;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyAbstractField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.server.VaadinRequest;
@@ -15,6 +13,8 @@ import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
index 8ddfa81193..053d4460d2 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
@@ -7,7 +7,6 @@ import com.vaadin.data.HasRequired;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.tests.components.TestBase;
@@ -15,6 +14,7 @@ import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Component;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
index 337a4abd37..2573ca57fa 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class ComplexGLColumnExpansionWithColSpan extends AbstractTestCase {
     private int cols;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
index 5ceb3bff51..812cc5b965 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CssLayout;
 
 @SuppressWarnings("serial")
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
index 1fca946b84..1cc6427451 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CssLayout;
 
 public class CssLayoutRemoveComponentWithCaption extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index 609e2fc7c6..555843cd97 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java
index 05deb7a68e..45a7db8893 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.layouts;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbsoluteLayout;
@@ -33,6 +32,7 @@ import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  *
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java
index ac2bab012c..e014f2eb34 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java
@@ -5,12 +5,12 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Iterator;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java
index 635bda8194..79e65854fc 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.VerticalLayout;
 
 @SuppressWarnings("serial")
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index 5329e4191a..d0e21cb482 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
@@ -4,7 +4,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.tests.components.TestBase;
@@ -13,6 +12,7 @@ import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
index 40a41e6cbe..90dc5f68d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class OrderedLayoutCSSCompatibility extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
index 69775f8f13..bbbc60a4bd 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
@@ -15,11 +15,11 @@
  */
 package com.vaadin.tests.layouts;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.FormLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class RelativeSizeInUndefinedCssLayout extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java
index cb05be9cc6..1b5203deba 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
index 59689f3d82..0eef48a7e8 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
index 8126a43ca9..c8bd332eba 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.layouts.gridlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java
index 6bd7d9368e..7ee5cf85f7 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.layouts.gridlayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.NativeButton;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
index ebd063a2bc..83cc7b41ae 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.layouts.layouttester;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.AbstractComponent;
@@ -23,6 +22,7 @@ import com.vaadin.ui.AbstractLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseIcon.java
index df183898dc..4256968dc4 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseIcon.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.layouts.layouttester;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.AbstractLayout;
 import com.vaadin.ui.Button;
@@ -23,6 +22,7 @@ import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.TabSheet;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  *
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
index 9a83891dd2..91aeee0612 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.layouts.layouttester;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.Resource;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
@@ -29,6 +28,7 @@ import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseRegError.java
index 5aa4a0f859..dae15c41ed 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseRegError.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseRegError.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.layouts.layouttester;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.AbstractLayout;
 import com.vaadin.ui.Button;
@@ -25,6 +24,7 @@ import com.vaadin.ui.DateField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.TabSheet;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  *
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
index 1bd562e2d5..d3a03ecc95 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
@@ -15,13 +15,13 @@
  */
 package com.vaadin.tests.layouts.layouttester.GridLayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
index 788d645c49..3e751fb5a5 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
@@ -15,13 +15,13 @@
  */
 package com.vaadin.tests.layouts.layouttester.GridLayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.TabSheet;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  *
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
index 845195b87c..723cba8102 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.layouts.layouttester.GridLayout;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
@@ -24,6 +23,7 @@ import com.vaadin.ui.DateField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.TabSheet;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  *
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
index d2d6980bbb..77e197a01f 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.minitutorials.v70;
 
 import javax.servlet.http.Cookie;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinService;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
index a09ee6b72d..ac2f1c3601 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
@@ -1,8 +1,5 @@
 package com.vaadin.tests.minitutorials.v70;
 
-import com.vaadin.legacy.data.validator.LegacyAbstractValidator;
-import com.vaadin.legacy.data.validator.LegacyEmailValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.shared.ui.MarginInfo;
@@ -13,6 +10,9 @@ import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.PasswordField;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.data.validator.LegacyAbstractValidator;
+import com.vaadin.v7.data.validator.LegacyEmailValidator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class SimpleLoginView extends CustomComponent
         implements View, Button.ClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
index 4ab78d9374..016d6b94bf 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
@@ -19,8 +19,6 @@ import java.text.NumberFormat;
 import java.util.Locale;
 
 import com.vaadin.annotations.Theme;
-import com.vaadin.legacy.data.util.converter.LegacyConverter;
-import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.CellReference;
@@ -28,6 +26,8 @@ import com.vaadin.ui.LegacyGrid.CellStyleGenerator;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.renderers.HtmlRenderer;
 import com.vaadin.ui.renderers.NumberRenderer;
+import com.vaadin.v7.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
 
 @Theme("valo")
 public class FormattingDataInGrid extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
index 6615dfea34..74ed83a51b 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
@@ -17,11 +17,11 @@
 package com.vaadin.tests.minitutorials.v7a1;
 
 import com.vaadin.annotations.PreserveOnRefresh;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Mini tutorial code for
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
index d9f5e62b2c..93a1c112bc 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.minitutorials.v7a1;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class CustomConverterFactoryUI extends AbstractTestUI {
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
index b86aacc8a9..bc977da249 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
@@ -3,11 +3,11 @@ package com.vaadin.tests.minitutorials.v7a1;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.PropertyId;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class FormUsingExistingLayout extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
index d1d49bc9d1..2ecb34f795 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.minitutorials.v7a1;
 import java.text.NumberFormat;
 import java.util.Locale;
 
-import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter;
 
 public class FormatTableValue extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
index b6f48ab48a..9abcdfd117 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
@@ -2,12 +2,12 @@ package com.vaadin.tests.minitutorials.v7a1;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
index 876eda78e9..5d5554cc0b 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
@@ -1,13 +1,13 @@
 package com.vaadin.tests.minitutorials.v7a1;
 
-import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException;
-import com.vaadin.legacy.data.util.converter.LegacyStringToIntegerConverter;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
+import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
index a7eecfdf2d..0278653ae4 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.minitutorials.v7a1;
 
-import com.vaadin.legacy.data.util.converter.LegacyConverter;
-import com.vaadin.legacy.data.util.converter.LegacyDefaultConverterFactory;
+import com.vaadin.v7.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.util.converter.LegacyDefaultConverterFactory;
 
 public class MyConverterFactory extends LegacyDefaultConverterFactory {
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
index 76eb76c03a..c376dce865 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.minitutorials.v7a1;
 import java.text.NumberFormat;
 import java.util.Locale;
 
-import com.vaadin.legacy.data.util.converter.LegacyStringToDoubleConverter;
+import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter;
 
 public class MyStringToDoubleConverter extends LegacyStringToDoubleConverter {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
index 6156791750..5af5fa4483 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
@@ -2,14 +2,14 @@ package com.vaadin.tests.minitutorials.v7a1;
 
 import java.util.Locale;
 
-import com.vaadin.legacy.data.util.converter.LegacyConverter;
-import com.vaadin.legacy.data.util.converter.LegacyConverter.ConversionException;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Notification;
 
 public class StringMyTypeConverter extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
index b2eed2ea85..003f7c9923 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
@@ -21,10 +21,10 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
 
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.data.validator.LegacyBeanValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.UI;
+import com.vaadin.v7.data.validator.LegacyBeanValidator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Mini tutorial code for
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
index f809a9017e..8cab38cb45 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
@@ -16,11 +16,11 @@
 
 package com.vaadin.tests.minitutorials.v7b5;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinService;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java
index 23d0b832e8..b686cb9235 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.minitutorials.v7b9;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.navigator.Navigator;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.Panel;
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
index d7ef31cf56..1053255e87 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
@@ -5,8 +5,6 @@ import java.util.Date;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyDateField;
-import com.vaadin.legacy.ui.LegacyInlineDateField;
 import com.vaadin.navigator.Navigator;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener;
@@ -19,6 +17,8 @@ import com.vaadin.ui.Notification.Type;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.LegacyInlineDateField;
 
 public class SettingsView extends Panel implements View {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
index 82e2a331a3..d8f31b2acf 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
@@ -24,7 +24,6 @@ import java.util.Collections;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.shared.communication.PushMode;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.shared.ui.ui.Transport;
@@ -32,6 +31,7 @@ import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.NativeSelect;
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
index 15077bf5d8..264dc9f3d4 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
@@ -22,13 +22,13 @@ package com.vaadin.tests.push;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
index b376f05fc8..3925b80fc6 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
@@ -16,7 +16,6 @@
 package com.vaadin.tests.push;
 
 import com.vaadin.annotations.Widgetset;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.TestingWidgetSet;
@@ -24,6 +23,7 @@ import com.vaadin.tests.widgetset.server.RoundTripTester;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @Widgetset(TestingWidgetSet.NAME)
 public class RoundTripTest extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
index 655bdc0355..e627c700e3 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
@@ -14,8 +14,6 @@ import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.data.util.BeanItem;
-import com.vaadin.legacy.ui.LegacyDateField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.shared.ui.combobox.FilteringMode;
@@ -51,6 +49,8 @@ import com.vaadin.ui.components.calendar.event.CalendarEvent;
 import com.vaadin.ui.components.calendar.handler.BasicDateClickHandler;
 import com.vaadin.ui.components.calendar.handler.BasicWeekClickHandler;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /** Calendar component test application */
 @Theme("valo-test")
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java
index ae1930ce4e..5c2e67e9d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java
@@ -18,7 +18,6 @@ package com.vaadin.tests.themes.valo;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.event.ShortcutAction.KeyCode;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.server.AbstractErrorMessage;
@@ -52,6 +51,7 @@ import com.vaadin.ui.Window;
 import com.vaadin.ui.Window.CloseEvent;
 import com.vaadin.ui.Window.CloseListener;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class CommonParts extends VerticalLayout implements View {
     public CommonParts() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
index 833a4e0e0b..9b46a8eba2 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
@@ -17,7 +17,6 @@ package com.vaadin.tests.themes.valo;
 
 import java.util.Date;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.server.UserError;
@@ -37,6 +36,7 @@ import com.vaadin.ui.RichTextArea;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  *
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
index c2568b17da..5d5091a4b1 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
@@ -21,7 +21,6 @@ import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
 import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.ui.Button;
@@ -42,6 +41,7 @@ import com.vaadin.ui.Table.TableDragMode;
 import com.vaadin.ui.TreeTable;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Tables extends VerticalLayout implements View {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java
index a79bee8a6c..dbdb377cb8 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.tests.themes.valo;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.server.FontAwesome;
@@ -29,6 +28,7 @@ import com.vaadin.ui.RichTextArea;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TextFields extends VerticalLayout implements View {
     private TestIcon testIcon = new TestIcon(140);
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java
index 6ba6236e4a..0c1c767640 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java
@@ -3,7 +3,6 @@ package com.vaadin.tests.tickets;
 import java.util.Date;
 
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
@@ -14,6 +13,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.PopupView;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket1397 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java
index 69ec6f0b70..e5dc6806e6 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1663.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.SystemError;
 import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket1663 extends com.vaadin.server.LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java
index 267afc5fa2..52ad794dff 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1772.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
index bd451b9b80..11839e0197 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1804.java
@@ -4,12 +4,12 @@ import java.util.Iterator;
 import java.util.LinkedList;
 
 import com.vaadin.data.util.MethodProperty;
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.server.SystemError;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.ui.LegacyAbstractField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Select;
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java
index 2e387ea9bc..6ad7d998a3 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1805.java
@@ -2,12 +2,12 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout.MarginHandler;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.LegacyWindow;
 
 public class Ticket1805 extends com.vaadin.server.LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java
index e55fa72d10..6ec56a8315 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1806.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.LegacyWindow;
 
 public class Ticket1806 extends com.vaadin.server.LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1811.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1811.java
index 16fcb55c7d..ff4acd84a0 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1811.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1811.java
@@ -3,12 +3,12 @@ package com.vaadin.tests.tickets;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.data.validator.LegacyStringLengthValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Window;
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1819.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1819.java
index 1a73490de8..a41a0fbf94 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1819.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1819.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.tickets;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import com.vaadin.legacy.ui.LegacyAbstractField;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyAbstractField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Select;
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java
index 19462300ec..5b5aab5102 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1900.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket1900 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1916.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1916.java
index b5d6199a54..76d577ba41 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1916.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1916.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket1916 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java
index 0ab447488f..9c5f5cf7e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1939.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1940.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1940.java
index dd3e93f12a..22b22cb7c2 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1940.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1940.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket1940 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java
index 686027e9c1..fa1d9a6865 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1966_3.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
@@ -9,6 +8,7 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket1966_3 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1986.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1986.java
index 50184b872b..2d322e747d 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1986.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1986.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.ComboBox;
@@ -11,6 +10,7 @@ import com.vaadin.ui.ListSelect;
 import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.OptionGroup;
 import com.vaadin.ui.TwinColSelect;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket1986 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java
index 6b66581c5a..a704550847 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket20.java
@@ -1,16 +1,16 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.data.util.MethodProperty;
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.data.validator.LegacyCompositeValidator;
-import com.vaadin.legacy.data.validator.LegacyCompositeValidator.CombinationMode;
-import com.vaadin.legacy.data.validator.LegacyIntegerValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.tests.util.CheckBoxWithPropertyDataSource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.data.validator.LegacyCompositeValidator;
+import com.vaadin.v7.data.validator.LegacyIntegerValidator;
+import com.vaadin.v7.data.validator.LegacyCompositeValidator.CombinationMode;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket20 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java
index c894a73e5e..981f5bbbfb 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2002.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.data.util.MethodProperty;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2002 extends LegacyApplication {
     private Long long1 = new Long(1L);
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java
index 4cb9382d1b..9986bd6303 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2009.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Container;
 import com.vaadin.event.ItemClickEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java
index 2eee70e352..8d4b638d1f 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2024.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2024 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2026.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2026.java
index 3cd6b35775..cc8cdfc7c1 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2026.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2026.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2026 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2029.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2029.java
index 91d6d5d7b6..38e9c6db0d 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2029.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2029.java
@@ -4,7 +4,6 @@ import java.util.Random;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
@@ -15,6 +14,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2029 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java
index ba6aa0841e..ff07a336ff 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2038.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Notification;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2038 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2040.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2040.java
index 7a92714c04..cf08706f47 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2040.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2040.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout.MarginHandler;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextArea;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2051.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2051.java
index d81817921c..874c9d813b 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2051.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2051.java
@@ -1,7 +1,6 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Item;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
@@ -10,6 +9,7 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2051 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java
index 3331386247..2b6a6d7220 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2053.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java
index 008d2381f1..99ae307ad8 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2061b.java
@@ -4,7 +4,6 @@ import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.HierarchicalContainer;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Sizeable;
 import com.vaadin.ui.AbstractOrderedLayout;
@@ -17,6 +16,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
 import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.VerticalSplitPanel;
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2062.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2062.java
index 201ae7b5ca..ce4a599447 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2062.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2062.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2062 extends LegacyApplication {
     private static final Object P1 = new Object();
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2090.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2090.java
index 4321a93c92..cb507acde4 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2090.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2090.java
@@ -2,12 +2,12 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2090 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java
index 4fc86bfa10..7d435cdb7f 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2107.java
@@ -2,12 +2,12 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Notification;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2107 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java
index 161b082c38..014d87b4ff 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2179.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2179 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java
index bec49d77a1..53f8212189 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2181.java
@@ -5,12 +5,12 @@ import java.util.Date;
 import java.util.Random;
 import java.util.Set;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.OptionGroup;
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2221.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2221.java
index 2dd1e4639d..d423eefeaf 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2221.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2221.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Layout;
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2240.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2240.java
index 28c264f1eb..a1c0c4d1e7 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2240.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2240.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2240 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2405.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2405.java
index 44a7d49d25..cbb329839b 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2405.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2405.java
@@ -1,6 +1,5 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Alignment;
@@ -10,6 +9,7 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout.MarginHandler;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2415.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2415.java
index 18561922c1..12e0590eb2 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2415.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2415.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.tickets;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket2415 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java
index e7d7d3bafd..6b381c3057 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java
@@ -10,10 +10,6 @@ import java.util.Set;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.ui.LegacyDateField;
-import com.vaadin.legacy.ui.LegacyField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Component;
@@ -29,6 +25,10 @@ import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Table layout is very slow in Firefox 3.0.10 when the table contains
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket3146.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket3146.java
index 02258fed30..2f49f398ff 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket3146.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket3146.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.tickets;
 import java.util.Collection;
 import java.util.HashSet;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Table;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java
index c7b44f3802..0ca2ba91da 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket34.java
@@ -3,12 +3,12 @@ package com.vaadin.tests.tickets;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Page;
 import com.vaadin.server.Page.UriFragmentChangedEvent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5157.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5157.java
index 68082549fc..90f24beb19 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5157.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket5157.java
@@ -1,13 +1,13 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.event.ShortcutAction.KeyCode;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.event.ShortcutListener;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Key codes were converted to lower case on the server (overlapping special key
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java
index 857e855569..e71c86c568 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket6002.java
@@ -3,11 +3,11 @@ package com.vaadin.tests.tickets;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket6002 extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket846.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket846.java
index 00a5912f0a..4ab6a9dcdf 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket846.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket846.java
@@ -1,13 +1,13 @@
 package com.vaadin.tests.tickets;
 
 import com.vaadin.data.util.MethodProperty;
-import com.vaadin.legacy.data.validator.LegacyIntegerValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.tests.util.CheckBoxWithPropertyDataSource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.data.validator.LegacyIntegerValidator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class Ticket846 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket932.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket932.java
index 20e591b3e8..ab3a19e5fb 100644
--- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket932.java
+++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket932.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextArea;
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/LongTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/LongTooltip.java
index 1708b820d9..f2d0ab3a54 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/LongTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/LongTooltip.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.tooltip;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.GridLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class LongTooltip extends TestBase {
     private int tooltipCount = 0;
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java
index 7655a5192c..7b48dc6227 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.tooltip;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.NativeButton;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TooltipConfiguration extends AbstractTestUIWithLog {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java
index 0ae97024e4..252420c35a 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java
@@ -16,11 +16,11 @@
 
 package com.vaadin.tests.tooltip;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TooltipInWindow extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
index 6e239a2164..337def9e67 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.tooltip;
 
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Test to see if the width of the tooltip element is updated if a narrower
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java
index d31f34805f..ce95c85cbc 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java
@@ -15,10 +15,10 @@
  */
 package com.vaadin.tests.tooltip;
 
-import com.vaadin.legacy.data.validator.LegacyIntegerRangeValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  *
diff --git a/uitest/src/main/java/com/vaadin/tests/util/AlwaysFailValidator.java b/uitest/src/main/java/com/vaadin/tests/util/AlwaysFailValidator.java
index e3154ba14c..a9ab397541 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/AlwaysFailValidator.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/AlwaysFailValidator.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.util;
 
-import com.vaadin.legacy.data.validator.LegacyAbstractValidator;
+import com.vaadin.v7.data.validator.LegacyAbstractValidator;
 
 public class AlwaysFailValidator extends LegacyAbstractValidator<Object> {
     public AlwaysFailValidator() {
diff --git a/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java b/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java
index 5327eb7d27..90c56f0a2c 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.util;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeNotifier;
-import com.vaadin.legacy.data.Validator.InvalidValueException;
 import com.vaadin.ui.CheckBox;
+import com.vaadin.v7.data.Validator.InvalidValueException;
 
 public class CheckBoxWithPropertyDataSource extends CheckBox {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
index 5a42fc415c..e092a1bc68 100644
--- a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
@@ -17,11 +17,6 @@ package com.vaadin.tests.validation;
 
 import java.util.Set;
 
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.data.validator.LegacyStringLengthValidator;
-import com.vaadin.legacy.ui.LegacyAbstractField;
-import com.vaadin.legacy.ui.LegacyField;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.UserError;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
@@ -35,6 +30,11 @@ import com.vaadin.ui.RichTextArea;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TwinColSelect;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
+import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class FieldErrorIndication extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java b/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
index 67db5d0338..b58d74feb4 100644
--- a/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
@@ -2,13 +2,13 @@ package com.vaadin.tests.validation;
 
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.legacy.data.Validator;
-import com.vaadin.legacy.data.validator.LegacyIntegerValidator;
-import com.vaadin.legacy.data.validator.LegacyStringLengthValidator;
-import com.vaadin.legacy.ui.LegacyTextField;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.CheckBox;
+import com.vaadin.v7.data.Validator;
+import com.vaadin.v7.data.validator.LegacyIntegerValidator;
+import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @SuppressWarnings("deprecation")
 public class ValidationOfRequiredEmptyFields extends AbstractTestUI {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java
index 49a2e3abab..d024c39087 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java
@@ -22,8 +22,8 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.tests.legacyelements.LegacyDateFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyDateFieldElement;
 
 /**
  * @author Vaadin Ltd
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
index ac0e68ce1b..c4f5ced747 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
@@ -22,8 +22,8 @@ import org.openqa.selenium.By;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.GridElement;
 import com.vaadin.testbench.parallel.TestCategory;
-import com.vaadin.tests.legacyelements.LegacyCheckBoxElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyCheckBoxElement;
 
 @TestCategory("grid")
 public class GridCheckBoxDisplayTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
index 67615289dc..92f36cb5a5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
@@ -28,8 +28,8 @@ import com.vaadin.testbench.elements.GridElement.GridEditorElement;
 import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.parallel.TestCategory;
-import com.vaadin.tests.legacyelements.LegacyDateFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserThemeTest;
+import com.vaadin.v7.tests.elements.LegacyDateFieldElement;
 
 @TestCategory("grid")
 public class GridThemeUITest extends MultiBrowserThemeTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
index eeb65cade9..fd4a651f63 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
@@ -19,7 +19,6 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.legacy.data.util.converter.LegacyStringToEnumConverter;
 import com.vaadin.shared.ui.ui.NotificationRole;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ButtonElement;
@@ -27,6 +26,7 @@ import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.data.util.converter.LegacyStringToEnumConverter;
 
 /**
  * Unit test class for Notification ARIA (Accessible Rich Internet Applications)
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
index 5eca7e0344..70b5533b05 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.internal.Coordinates;
 import org.openqa.selenium.internal.Locatable;
 
-import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
 
 public class ErrorIndicatorTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
index ad1748ceda..81e714f270 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
@@ -19,8 +19,8 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.Keys;
 
-import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
 
 public class EnumTextFieldTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
index 8b01161818..7519d2e75e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
@@ -6,8 +6,8 @@ import static org.hamcrest.core.Is.is;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
 
 public class LocaleChangeOnReadOnlyFieldTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
index 2a961405ab..fd198d2bee 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
@@ -19,8 +19,8 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
 
 /**
  * Test for .v-required style
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
index 716a28fa8f..80cd426077 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.ui;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
 
 public class UIPollingTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java b/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
index 3e848f4424..4e7a311139 100644
--- a/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
@@ -6,8 +6,8 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.elements.TextFieldElement;
-import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
 
 public class ConverterThatEnforcesAFormatTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
index 1c63f2b2ca..20734455c1 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
@@ -31,8 +31,8 @@ import com.vaadin.testbench.elements.GridElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.GridElement.GridEditorElement;
 import com.vaadin.testbench.parallel.TestCategory;
-import com.vaadin.tests.legacyelements.LegacyDateFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyDateFieldElement;
 
 @TestCategory("grid")
 public class BasicCrudGridEditorRowTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
index 6b830d24c9..25d41e9d01 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
@@ -25,9 +25,9 @@ import com.vaadin.testbench.elements.TableRowElement;
 import com.vaadin.testbench.elements.TextAreaElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.data.bean.Sex;
-import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
+import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
 
 public abstract class BasicPersonFormTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
index eb9de91073..7ce92a2d45 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
@@ -5,11 +5,11 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
-import com.vaadin.tests.legacyelements.LegacyDateFieldElement;
-import com.vaadin.tests.legacyelements.LegacyInlineDateFieldElement;
-import com.vaadin.tests.legacyelements.LegacyPopupDateFieldElement;
-import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyDateFieldElement;
+import com.vaadin.v7.tests.elements.LegacyInlineDateFieldElement;
+import com.vaadin.v7.tests.elements.LegacyPopupDateFieldElement;
+import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
 
 public class DateFormTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
index a35593d060..f2917229e5 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
@@ -8,8 +8,8 @@ import org.junit.Test;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.elements.TextFieldElement;
-import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
 
 public class MultipleValidationErrorsTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
index 1209ce2338..3bb02a7abf 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
@@ -18,8 +18,8 @@ package com.vaadin.tests.tooltip;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.TextFieldElement;
-import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.TooltipTest;
+import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
 
 /**
  * Test to see if validators create error tooltips correctly.
diff --git a/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java b/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
index 85454094c9..6f2cb10b6f 100644
--- a/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
@@ -13,8 +13,8 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.elements.VerticalLayoutElement;
-import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
 
 public class ValidationOfRequiredEmptyFieldsTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyCheckBoxElement.java b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyCheckBoxElement.java
index 3fe30a2614..27421c00c9 100644
--- a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyCheckBoxElement.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyCheckBoxElement.java
@@ -1,9 +1,9 @@
-package com.vaadin.tests.legacyelements;
+package com.vaadin.v7.tests.elements;
 
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
 
-@ServerClass("com.vaadin.legacy.ui.LegacyCheckBox")
+@ServerClass("com.vaadin.v7.ui.LegacyCheckBox")
 public class LegacyCheckBoxElement extends CheckBoxElement {
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyDateFieldElement.java b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyDateFieldElement.java
index c2321d24d4..a599cf7ff2 100644
--- a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyDateFieldElement.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyDateFieldElement.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.legacyelements;
+package com.vaadin.v7.tests.elements;
 
 import com.vaadin.testbench.elements.DateFieldElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
@@ -22,7 +22,7 @@ import com.vaadin.testbench.elementsbase.ServerClass;
  * @author Vaadin Ltd
  *
  */
-@ServerClass("com.vaadin.legacy.ui.LegacyDateField")
+@ServerClass("com.vaadin.v7.ui.LegacyDateField")
 public class LegacyDateFieldElement extends DateFieldElement {
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyInlineDateFieldElement.java b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyInlineDateFieldElement.java
index fc06376b94..7bfcd826c8 100644
--- a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyInlineDateFieldElement.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyInlineDateFieldElement.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.legacyelements;
+package com.vaadin.v7.tests.elements;
 
 import com.vaadin.testbench.elements.InlineDateFieldElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
@@ -22,7 +22,7 @@ import com.vaadin.testbench.elementsbase.ServerClass;
  * @author Vaadin Ltd
  *
  */
-@ServerClass("com.vaadin.legacy.ui.LegacyInlineDateField")
+@ServerClass("com.vaadin.v7.ui.LegacyInlineDateField")
 public class LegacyInlineDateFieldElement extends InlineDateFieldElement {
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyPopupDateFieldElement.java b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyPopupDateFieldElement.java
index 28d4ff35a0..ea27aa8811 100644
--- a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyPopupDateFieldElement.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyPopupDateFieldElement.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.tests.legacyelements;
+package com.vaadin.v7.tests.elements;
 
 import com.vaadin.testbench.elements.PopupDateFieldElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
@@ -22,7 +22,7 @@ import com.vaadin.testbench.elementsbase.ServerClass;
  * @author Vaadin Ltd
  *
  */
-@ServerClass("com.vaadin.legacy.ui.LegacyPopupDateField")
+@ServerClass("com.vaadin.v7.ui.LegacyPopupDateField")
 public class LegacyPopupDateFieldElement extends PopupDateFieldElement {
 
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyTextFieldElement.java b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyTextFieldElement.java
index 14ce6e6f79..be56a2ef58 100644
--- a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyTextFieldElement.java
+++ b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyTextFieldElement.java
@@ -1,9 +1,9 @@
-package com.vaadin.tests.legacyelements;
+package com.vaadin.v7.tests.elements;
 
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
 
-@ServerClass("com.vaadin.legacy.ui.LegacyTextField")
+@ServerClass("com.vaadin.v7.ui.LegacyTextField")
 public class LegacyTextFieldElement extends TextFieldElement {
 
 }
author	Artur Signell <artur@vaadin.com>	2016-08-18 14:57:13 +0300
committer	Artur Signell <artur@vaadin.com>	2016-08-18 20:05:56 +0300
commit	f3c880194b20b9f9d192e72724865233065ccf04 (patch)
tree	957213861b4f70568aa33380cca0a2beb4601657 /uitest
parent	387649190cdbb93d11dc3714de73f0dcdc4c4059 (diff)
download	vaadin-framework-f3c880194b20b9f9d192e72724865233065ccf04.tar.gz vaadin-framework-f3c880194b20b9f9d192e72724865233065ccf04.zip