Move LegacyWindow back to com.vaadin.ui

There are too many dependencies between Legacy* and the core framework
to be able to easily separate them.

Change-Id: I6888e7a370b5d8da587e421abe3cb4686855c72f

76 files changed, 76 insertions, 81 deletions

diff --git a/server/src/main/java/com/vaadin/server/ClassResource.java b/server/src/main/java/com/vaadin/server/ClassResource.java
index d3114a36ef..83a9371f8f 100644
--- a/server/src/main/java/com/vaadin/server/ClassResource.java
+++ b/server/src/main/java/com/vaadin/server/ClassResource.java
@@ -18,9 +18,9 @@ package com.vaadin.server;
 
 import java.io.Serializable;
 
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
 import com.vaadin.util.FileTypeResolver;
-import com.vaadin.v7.ui.LegacyWindow;
 
 /**
  * <code>ClassResource</code> is a named resource accessed with the class
diff --git a/server/src/main/java/com/vaadin/server/LegacyApplication.java b/server/src/main/java/com/vaadin/server/LegacyApplication.java
index 1e6714fa2a..93f3da3d8f 100644
--- a/server/src/main/java/com/vaadin/server/LegacyApplication.java
+++ b/server/src/main/java/com/vaadin/server/LegacyApplication.java
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
-import com.vaadin.v7.ui.LegacyWindow;
 
 /**
  * A special application designed to help migrating applications from Vaadin 6
diff --git a/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java
index 18e44add09..4ad7097e3b 100644
--- a/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java
+++ b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java
@@ -21,8 +21,8 @@ import java.net.URL;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
-import com.vaadin.v7.ui.LegacyWindow;
 
 /**
  *
diff --git a/server/src/main/java/com/vaadin/server/Page.java b/server/src/main/java/com/vaadin/server/Page.java
index 4b4984ebb7..7142659fca 100644
--- a/server/src/main/java/com/vaadin/server/Page.java
+++ b/server/src/main/java/com/vaadin/server/Page.java
@@ -34,11 +34,11 @@ import com.vaadin.shared.ui.ui.UIConstants;
 import com.vaadin.shared.ui.ui.UIState;
 import com.vaadin.shared.util.SharedUtil;
 import com.vaadin.ui.JavaScript;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.UI;
 import com.vaadin.util.ReflectTools;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class Page implements Serializable {
 
diff --git a/server/src/main/java/com/vaadin/v7/ui/LegacyWindow.java b/server/src/main/java/com/vaadin/ui/LegacyWindow.java
index c313dcb627..a6771da379 100644
--- a/server/src/main/java/com/vaadin/v7/ui/LegacyWindow.java
+++ b/server/src/main/java/com/vaadin/ui/LegacyWindow.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.v7.ui;
+package com.vaadin.ui;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -24,11 +24,6 @@ import com.vaadin.server.Page.BrowserWindowResizeListener;
 import com.vaadin.server.Resource;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.BorderStyle;
-import com.vaadin.ui.Component;
-import com.vaadin.ui.ComponentContainer;
-import com.vaadin.ui.Link;
-import com.vaadin.ui.UI;
-import com.vaadin.ui.VerticalLayout;
 
 /**
  * Helper class to emulate the main window from Vaadin 6 using UIs. This class
diff --git a/server/src/test/java/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java b/server/src/test/java/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java
index d4b6baa503..2a88bb3208 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java
@@ -9,7 +9,7 @@ import org.junit.Test;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.ui.LegacyWindow;
 
 public class LegacyUIAddRemoveComponentsTest {
 
diff --git a/server/src/test/java/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java
index 9ec970faba..7fa8665c01 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java
@@ -9,9 +9,9 @@ import org.junit.Test;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class AddRemoveSubWindowTest {
 
diff --git a/server/src/test/java/com/vaadin/tests/server/components/WindowTest.java b/server/src/test/java/com/vaadin/tests/server/components/WindowTest.java
index 2cd9236458..ed22870b59 100644
--- a/server/src/test/java/com/vaadin/tests/server/components/WindowTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/components/WindowTest.java
@@ -7,12 +7,12 @@ import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Window;
 import com.vaadin.ui.Window.CloseEvent;
 import com.vaadin.ui.Window.CloseListener;
 import com.vaadin.ui.Window.ResizeEvent;
 import com.vaadin.ui.Window.ResizeListener;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class WindowTest {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/Components.java b/uitest/src/main/java/com/vaadin/tests/Components.java
index 3b038672ab..d16afa1232 100644
--- a/uitest/src/main/java/com/vaadin/tests/Components.java
+++ b/uitest/src/main/java/com/vaadin/tests/Components.java
@@ -20,13 +20,13 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.DefaultItemSorter;
 import com.vaadin.v7.data.util.HierarchicalContainer;
 import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Tree;
 import com.vaadin.v7.ui.Tree.ItemStyleGenerator;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
index 18a6ecf46e..580faf9be3 100644
--- a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
@@ -23,12 +23,12 @@ import com.vaadin.ui.Component.Event;
 import com.vaadin.ui.Component.Listener;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.PasswordField;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.ui.Field;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Tree;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
index bd1ef0a71f..0be5305708 100644
--- a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
@@ -24,10 +24,10 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 
 /**
  * This example demonstrates layouts. Layouts are populated with sample Vaadin
diff --git a/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
index 10fa0a50b8..915e120a7a 100644
--- a/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
@@ -6,6 +6,7 @@ import java.util.Iterator;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.v7.data.Container.ItemSetChangeEvent;
 import com.vaadin.v7.data.Container.ItemSetChangeListener;
 import com.vaadin.v7.data.Container.PropertySetChangeEvent;
@@ -13,7 +14,6 @@ import com.vaadin.v7.data.Container.PropertySetChangeListener;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Select;
 
 public class ListenerOrder extends com.vaadin.server.LegacyApplication
diff --git a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
index cbb91a8f42..b366e2d01b 100644
--- a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
@@ -20,9 +20,9 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.TextField;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
index 557003eb13..4d60ea4279 100644
--- a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
@@ -24,9 +24,9 @@ import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class NativeWindowing extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/Parameters.java b/uitest/src/main/java/com/vaadin/tests/Parameters.java
index 42379e4017..256f1ca713 100644
--- a/uitest/src/main/java/com/vaadin/tests/Parameters.java
+++ b/uitest/src/main/java/com/vaadin/tests/Parameters.java
@@ -27,10 +27,10 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
index dde926234e..a558532f6b 100644
--- a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
+++ b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
@@ -27,11 +27,11 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Select;
 import com.vaadin.v7.ui.TextField;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/ScrollbarStressTest.java b/uitest/src/main/java/com/vaadin/tests/ScrollbarStressTest.java
index 7ca1b8ca77..9b0d493efb 100644
--- a/uitest/src/main/java/com/vaadin/tests/ScrollbarStressTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/ScrollbarStressTest.java
@@ -8,12 +8,12 @@ import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.VerticalSplitPanel;
 import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.OptionGroup;
 import com.vaadin.v7.ui.Table;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestBench.java b/uitest/src/main/java/com/vaadin/tests/TestBench.java
index f0ae215794..f904925f1d 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestBench.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestBench.java
@@ -33,12 +33,12 @@ import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.util.HierarchicalContainer;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Tree;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index cadef51b0d..a030768521 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
@@ -19,9 +19,9 @@ package com.vaadin.tests;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.VerticalSplitPanel;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class TestForApplicationLayoutThatUsesWholeBrosersSpace
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
index 96d4879a30..18db338f81 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
@@ -24,9 +24,9 @@ import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class TestForNativeWindowing extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
index 7811deac27..3f53686071 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
@@ -33,6 +33,7 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Upload;
@@ -45,7 +46,6 @@ import com.vaadin.ui.Upload.StartedListener;
 import com.vaadin.ui.Upload.SucceededEvent;
 import com.vaadin.ui.Upload.SucceededListener;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.ProgressIndicator;
 
 public class TestForStyledUpload extends LegacyApplication
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
index c494f0ab16..5014dcfac4 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
@@ -36,6 +36,7 @@ import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Upload;
@@ -45,7 +46,6 @@ import com.vaadin.ui.Upload.StartedListener;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.ui.AbstractField;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.v7.ui.Select;
 import com.vaadin.v7.ui.TextField;
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
index 5f5777108d..c12a70c04d 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
@@ -21,9 +21,9 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Component;
 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.LegacyWindow;
 
 public class TestSetVisibleAndCaching
         extends com.vaadin.server.LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
index dbb1b517cd..2849be80d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
@@ -32,6 +32,7 @@ import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Container;
@@ -39,7 +40,6 @@ import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.ComboBox;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class TestSizeableIncomponents extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java b/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java
index 7ece674dd3..38bb88fe5d 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java
@@ -17,8 +17,8 @@
 package com.vaadin.tests;
 
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalSplitPanel;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class TestSplitPanel extends com.vaadin.server.LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
index 80ff0aaccc..7f5c6da809 100644
--- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
@@ -22,10 +22,10 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.util.SampleDirectory;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Item;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Tree;
 import com.vaadin.v7.ui.Tree.ExpandEvent;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
index 9892d1725e..7952bfe688 100644
--- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
@@ -23,12 +23,12 @@ import com.vaadin.tests.util.SampleDirectory;
 import com.vaadin.ui.Component.Event;
 import com.vaadin.ui.Component.Listener;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.util.FilesystemContainer;
 import com.vaadin.v7.data.util.FilesystemContainer.FileItem;
 import com.vaadin.v7.ui.Field;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Tree;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
index e4be12648e..d2058fd886 100644
--- a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
@@ -21,11 +21,11 @@ import java.util.Random;
 
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Select;
 
 public class UsingObjectsInSelect extends com.vaadin.server.LegacyApplication
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 17059cf08a..89b92192de 100644
--- a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
@@ -9,10 +9,10 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Notification;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.TextField;
 
 public class GAESyncTest extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
index 190d125214..c3ba0adb0b 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
@@ -5,7 +5,7 @@ import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.ui.LegacyWindow;
 
 public class ApplicationCloseTest extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/application/ErrorInUnloadEvent.java b/uitest/src/main/java/com/vaadin/tests/application/ErrorInUnloadEvent.java
index dd6840b835..a09c4c845a 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ErrorInUnloadEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ErrorInUnloadEvent.java
@@ -9,10 +9,10 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.PasswordField;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class ErrorInUnloadEvent extends AbstractTestCase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/main/java/com/vaadin/tests/application/ThreadLocalInstances.java
index 63c29517f5..ed611117d0 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ThreadLocalInstances.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ThreadLocalInstances.java
@@ -10,8 +10,8 @@ import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Embedded;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class ThreadLocalInstances extends AbstractTestCase {
     private static final VaadinSession staticInitApplication = VaadinSession
diff --git a/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java
index 993833aadd..9c90e98ea0 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java
@@ -4,9 +4,9 @@ import com.vaadin.server.VaadinService;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class ChangeSessionId extends AbstractTestCase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/TestBase.java b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
index 995b62e712..f2d48a9ffa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 
 /**
  *
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
index 6b1ace2971..1eab44df0b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
@@ -21,7 +21,7 @@ import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
-import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.ui.LegacyWindow;
 
 public class AllComponentTooltipTest extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java
index 87ee746721..5424efc2cb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.abstractcomponent;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class EnableState extends AbstractTestCase {
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
index ae74090a27..6e6d77c635 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
@@ -3,13 +3,13 @@ package com.vaadin.tests.components.combobox;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.ui.ComboBox;
-import com.vaadin.v7.ui.LegacyWindow;
 
 @SuppressWarnings("serial")
 public class ComboBoxReapperingOldValue extends LegacyApplication
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
index a7657e0a13..513e11b1fe 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
@@ -4,8 +4,8 @@ import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.v7.ui.ComboBox;
-import com.vaadin.v7.ui.LegacyWindow;
 
 @SuppressWarnings("serial")
 public class GridLayoutComboBoxZoomOut extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
index 0fbd807d5e..1f5eb4b394 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
@@ -8,7 +8,7 @@ import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.GridLayout;
-import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.ui.LegacyWindow;
 
 public class DateFieldPopupOffScreen extends AbstractTestCase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
index c65f1a31e5..3a9ce202c7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.loginform;
 
 import com.vaadin.server.LegacyApplication;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.LoginForm;
 import com.vaadin.ui.LoginForm.LoginEvent;
 import com.vaadin.ui.LoginForm.LoginListener;
-import com.vaadin.v7.ui.LegacyWindow;
 
 @SuppressWarnings("serial")
 public class LoginFormWithMultipleWindows extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
index c3843bf737..2af36155ae 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.menubar;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Tree;
 
 public class MenuBarInSplitPanel extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
index 3e00c78247..a6b76eb18f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.menubar;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Alignment;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class MenuBarRunsOutOfBrowser extends AbstractTestCase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
index 70d9e2dcc5..5fef63ce86 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
@@ -6,9 +6,9 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class LayoutRenderTimeTest extends LegacyApplication {
 
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 e5c3b1c8b6..8f6a72c0f1 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
@@ -4,9 +4,9 @@ import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.TextField;
 
 public class VerticalLayoutWidthCalculation extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
index ce4ff734a4..3025da57e7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
@@ -7,8 +7,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.HorizontalSplitPanel;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.NativeButton;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class SplitPanelExtraScrollbars extends AbstractTestCase
         implements ClickListener {
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 b4ad8ffd5c..74838a6f5d 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
@@ -4,9 +4,9 @@ import com.vaadin.server.Sizeable;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
 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.LegacyWindow;
 import com.vaadin.v7.ui.TextField;
 
 public class SplitPanelWidthOnResize extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java b/uitest/src/main/java/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
index f7f1dc1a78..d5c4a2ca4f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
@@ -6,8 +6,8 @@ import java.util.List;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Person;
 import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.v7.data.util.BeanItemContainer;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class ScrollCausesRequestLoop extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SortLongTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortLongTable.java
index e36d33005f..a79f84b33b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SortLongTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortLongTable.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.table;
 
 import com.vaadin.tests.components.AbstractTestCase;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class SortLongTable extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java
index 01d246db14..d708483db5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.table;
 
 import com.vaadin.tests.components.AbstractTestCase;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.IndexedContainer;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class TableExtraScrollbars extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java
index 4d13033f93..c2321c807c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.util.IndexedContainer;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.v7.ui.Table;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderZoom.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderZoom.java
index 64faa43733..b761cbab74 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderZoom.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderZoom.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.CssLayout;
-import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class TableHeaderZoom extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
index 1863bd6cc6..bb272ac910 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.CheckBox;
-import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java
index 827f380125..c83964a829 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java
@@ -7,8 +7,8 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class TableToggleVisibility extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
index a016f481e1..0aa10662fa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
@@ -5,10 +5,10 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TabSheet.Tab;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class TabsheetNPE extends AbstractTestCase implements ClickListener {
 
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 b6814a9713..92e8a2bd4f 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
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.textfield;
 
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Component;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.TextField;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java
index 90db201e46..81f6539709 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.tree;
 
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Layout;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Tree;
 
 public class TreePerformanceTest extends AbstractTestCase {
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 359f0e18bc..e72498e6d7 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,8 +1,8 @@
 package com.vaadin.tests.components.tree;
 
 import com.vaadin.tests.components.AbstractTestCase;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.RichTextArea;
 import com.vaadin.v7.ui.TextField;
 import com.vaadin.v7.ui.Tree;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/uitest/src/main/java/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
index a5c6ed7048..455fb2e531 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
@@ -10,9 +10,9 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class AttachShouldBeCalledForSubWindows extends AbstractTestCase {
     private static final long serialVersionUID = 1L;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ExecuteJavaScript.java b/uitest/src/main/java/com/vaadin/tests/components/window/ExecuteJavaScript.java
index 44b04a5f9b..6f5cfc932f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ExecuteJavaScript.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ExecuteJavaScript.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components.window;
 
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class ExecuteJavaScript extends AbstractTestCase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java b/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java
index 0768f0b6d3..70d83a466b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java
@@ -8,11 +8,11 @@ import com.vaadin.tests.util.Log;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
 import com.vaadin.ui.Window.ResizeEvent;
 import com.vaadin.ui.Window.ResizeListener;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class LazyWindowResize extends AbstractTestCase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
index b7799f3ae8..c30857a786 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
@@ -4,8 +4,8 @@ import com.vaadin.server.ExternalResource;
 import com.vaadin.tests.TestForWindowOpen;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyWindow;
 
 public class LegacyWindowOpenTest extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
index f194311b19..eed034dd11 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
@@ -7,10 +7,10 @@ import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class WindowScrollingComponentIntoView extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingUp.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingUp.java
index b2b51cefc5..bbf824aa88 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingUp.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingUp.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.window;
 
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Button;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class WindowScrollingUp extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
index a7f9594918..d25919a9f2 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.containers.sqlcontainer;
 
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.combobox.FilteringMode;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.v7.ui.ComboBox;
-import com.vaadin.v7.ui.LegacyWindow;
 
 /**
  * See http://dev.vaadin.com/ticket/9155 .
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
index 745deab308..5013c6e220 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
@@ -7,12 +7,12 @@ import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
 import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
 import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.ProgressIndicator;
 
 // author table in testdb (MySQL) is set out as follows
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java
index 05a66a73c8..caaf25ffb3 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.containers.sqlcontainer;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class SqlcontainertableApplication extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/EmbedSizeTest.java b/uitest/src/main/java/com/vaadin/tests/integration/EmbedSizeTest.java
index 900743b315..8a94497686 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/EmbedSizeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/EmbedSizeTest.java
@@ -5,7 +5,7 @@ import com.vaadin.server.Page.BrowserWindowResizeEvent;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.CheckBox;
-import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.ui.LegacyWindow;
 
 public class EmbedSizeTest extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/IntegrationTestApplication.java b/uitest/src/main/java/com/vaadin/tests/integration/IntegrationTestApplication.java
index edb41152c7..575b2efb27 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/IntegrationTestApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/IntegrationTestApplication.java
@@ -4,10 +4,10 @@ import com.vaadin.server.ClassResource;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class IntegrationTestApplication extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
index c3057b849f..667365e9ea 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.integration;
 
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 
 /**
  * On Liferay in a freeform layout, this application should get its height from
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 c3ae31717e..33ccda1a4b 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
@@ -4,8 +4,8 @@ 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.LegacyWindow;
 import com.vaadin.v7.ui.TextField;
 
 public class ComplexGLColumnExpansionWithColSpan extends AbstractTestCase {
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 d90facb9c9..846f4eb9d7 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
@@ -6,8 +6,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 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.LegacyWindow;
 import com.vaadin.v7.ui.TextField;
 
 public class GridLayoutExpandRatioModification extends TestBase
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
index 9947ade6e4..bdda348005 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
@@ -4,7 +4,7 @@ import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
-import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.ui.LegacyWindow;
 
 public class GridLayoutInsidePanel2 extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/TreeWithBordersInLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
index f7cc37a80e..593dd842c5 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.layouts;
 
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Layout;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.Tree;
 
 public class TreeWithBordersInLayout extends AbstractTestCase {
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 b9964afb75..7265b0768a 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
@@ -5,8 +5,8 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyWindow;
 import com.vaadin.v7.ui.TextField;
 
 public class VerticalLayoutExpandRatioModification extends TestBase
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/ButtonsTest.java b/uitest/src/main/java/com/vaadin/tests/themes/ButtonsTest.java
index f3e9dbeed7..862636fa3b 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/ButtonsTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/ButtonsTest.java
@@ -7,8 +7,8 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Layout;
+import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.NativeButton;
-import com.vaadin.v7.ui.LegacyWindow;
 
 @SuppressWarnings("serial")
 public class ButtonsTest extends com.vaadin.server.LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
index 3792e9c7d3..d2048b528f 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
@@ -23,9 +23,9 @@ import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.ui.label.ContentMode;
 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.LegacyWindow;
 
 /**
  * Provides sample directory based on application directory. If this fails then