Organize imports

Change-Id: Ie58291fd4858d5421b23e56603808f158d559687

287 files changed, 265 insertions, 311 deletions

diff --git a/client/src/main/java/com/vaadin/client/ApplicationConnection.java b/client/src/main/java/com/vaadin/client/ApplicationConnection.java
index a351fab5d0..8bc6a7460f 100644
--- a/client/src/main/java/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/main/java/com/vaadin/client/ApplicationConnection.java
@@ -42,7 +42,6 @@ import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ApplicationConfiguration.ErrorMessage;
-import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent;
 import com.vaadin.client.ResourceLoader.ResourceLoadEvent;
 import com.vaadin.client.ResourceLoader.ResourceLoadListener;
 import com.vaadin.client.communication.ConnectionStateHandler;
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java
index 6a89b6c938..cf48586d01 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java
@@ -88,13 +88,13 @@ import com.vaadin.v7.shared.ui.grid.EditorServerRpc;
 import com.vaadin.v7.shared.ui.grid.GridClientRpc;
 import com.vaadin.v7.shared.ui.grid.GridColumnState;
 import com.vaadin.v7.shared.ui.grid.GridConstants;
+import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 import com.vaadin.v7.shared.ui.grid.GridServerRpc;
 import com.vaadin.v7.shared.ui.grid.GridState;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState;
-import com.vaadin.v7.shared.ui.grid.ScrollDestination;
-import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState.CellState;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState.RowState;
+import com.vaadin.v7.shared.ui.grid.ScrollDestination;
 
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/ImageRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/ImageRendererConnector.java
index 0f3dfc1cc5..1568f3cfc6 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/ImageRendererConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/ImageRendererConnector.java
@@ -20,8 +20,8 @@ import com.vaadin.client.communication.JsonDecoder;
 import com.vaadin.client.metadata.TypeDataStore;
 import com.vaadin.shared.communication.URLReference;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.v7.client.renderers.ImageRenderer;
 import com.vaadin.v7.client.renderers.ClickableRenderer.RendererClickHandler;
+import com.vaadin.v7.client.renderers.ImageRenderer;
 
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/MultiSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/MultiSelectionModelConnector.java
index ff40816d93..bdaf0f1f88 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/MultiSelectionModelConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/MultiSelectionModelConnector.java
@@ -39,8 +39,8 @@ import com.vaadin.v7.client.widget.grid.events.SelectAllEvent;
 import com.vaadin.v7.client.widget.grid.events.SelectAllHandler;
 import com.vaadin.v7.client.widget.grid.selection.MultiSelectionRenderer;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModel;
-import com.vaadin.v7.client.widget.grid.selection.SpaceSelectHandler;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Multi;
+import com.vaadin.v7.client.widget.grid.selection.SpaceSelectHandler;
 import com.vaadin.v7.client.widgets.Grid;
 import com.vaadin.v7.client.widgets.Grid.HeaderCell;
 import com.vaadin.v7.shared.ui.grid.GridState;
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/SingleSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/SingleSelectionModelConnector.java
index 8c206b8def..059278c311 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/SingleSelectionModelConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/SingleSelectionModelConnector.java
@@ -22,8 +22,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.v7.client.renderers.Renderer;
 import com.vaadin.v7.client.widget.grid.selection.ClickSelectHandler;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModel;
-import com.vaadin.v7.client.widget.grid.selection.SpaceSelectHandler;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Single;
+import com.vaadin.v7.client.widget.grid.selection.SpaceSelectHandler;
 import com.vaadin.v7.shared.ui.grid.GridState;
 import com.vaadin.v7.shared.ui.grid.selection.SingleSelectionModelServerRpc;
 import com.vaadin.v7.shared.ui.grid.selection.SingleSelectionModelState;
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java
index 782cd1ca44..fd1edda55d 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java
@@ -60,7 +60,6 @@ import com.vaadin.client.ui.FocusableFlexTable;
 import com.vaadin.client.ui.SubPartAware;
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.shared.util.SharedUtil;
-import com.vaadin.v7.client.ui.VPopupCalendar;
 
 @SuppressWarnings("deprecation")
 public class VCalendarPanel extends FocusableFlexTable implements
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VRichTextArea.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VRichTextArea.java
index a00ff78e9d..d46e73aeb9 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VRichTextArea.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VRichTextArea.java
@@ -40,8 +40,8 @@ import com.vaadin.client.BrowserInfo;
 import com.vaadin.client.ConnectorMap;
 import com.vaadin.client.ui.Field;
 import com.vaadin.client.ui.ShortcutActionHandler;
-import com.vaadin.client.ui.TouchScrollDelegate;
 import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.client.ui.TouchScrollDelegate;
 import com.vaadin.v7.client.ui.richtextarea.VRichTextToolbar;
 
 /**
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java
index ea3aa49833..62e8e123db 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java
@@ -58,12 +58,12 @@ import com.vaadin.v7.client.ui.VCalendar.WeekClickListener;
 import com.vaadin.v7.client.ui.calendar.schedule.CalendarDay;
 import com.vaadin.v7.client.ui.calendar.schedule.CalendarEvent;
 import com.vaadin.v7.client.ui.calendar.schedule.DateCell;
+import com.vaadin.v7.client.ui.calendar.schedule.DateCell.DateCellSlot;
 import com.vaadin.v7.client.ui.calendar.schedule.DateCellDayEvent;
 import com.vaadin.v7.client.ui.calendar.schedule.DateUtil;
 import com.vaadin.v7.client.ui.calendar.schedule.HasTooltipKey;
 import com.vaadin.v7.client.ui.calendar.schedule.MonthEventLabel;
 import com.vaadin.v7.client.ui.calendar.schedule.SimpleDayCell;
-import com.vaadin.v7.client.ui.calendar.schedule.DateCell.DateCellSlot;
 import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarDropHandler;
 import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarMonthDropHandler;
 import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarWeekDropHandler;
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java
index 8cb408fd7a..9d2677af54 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java
@@ -47,9 +47,9 @@ import com.vaadin.v7.client.ui.VScrollTable.FooterCell;
 import com.vaadin.v7.client.ui.VScrollTable.HeaderCell;
 import com.vaadin.v7.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow;
 import com.vaadin.v7.shared.ui.table.TableConstants;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 import com.vaadin.v7.shared.ui.table.TableServerRpc;
 import com.vaadin.v7.shared.ui.table.TableState;
-import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 
 @Connect(com.vaadin.v7.ui.Table.class)
 public class TableConnector extends AbstractFieldConnector
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java
index 094bbc0e9b..1b2b1dd776 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java
@@ -22,8 +22,8 @@ import com.vaadin.client.UIDL;
 import com.vaadin.client.WidgetUtil;
 import com.vaadin.client.ui.FocusableScrollPanel;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.v7.client.ui.VTreeTable;
 import com.vaadin.v7.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow;
+import com.vaadin.v7.client.ui.VTreeTable;
 import com.vaadin.v7.client.ui.VTreeTable.PendingNavigationEvent;
 import com.vaadin.v7.client.ui.VTreeTable.VTreeTableScrollBody.VTreeTableRow;
 import com.vaadin.v7.client.ui.table.TableConnector;
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java
index ca565e01c2..35874b5d4b 100644
--- a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java
+++ b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java
@@ -105,12 +105,14 @@ import com.vaadin.v7.client.widget.escalator.Row;
 import com.vaadin.v7.client.widget.escalator.RowContainer;
 import com.vaadin.v7.client.widget.escalator.RowVisibilityChangeEvent;
 import com.vaadin.v7.client.widget.escalator.RowVisibilityChangeHandler;
+import com.vaadin.v7.client.widget.escalator.ScrollbarBundle.Direction;
 import com.vaadin.v7.client.widget.escalator.Spacer;
 import com.vaadin.v7.client.widget.escalator.SpacerUpdater;
-import com.vaadin.v7.client.widget.escalator.ScrollbarBundle.Direction;
 import com.vaadin.v7.client.widget.escalator.events.RowHeightChangedEvent;
 import com.vaadin.v7.client.widget.escalator.events.RowHeightChangedHandler;
 import com.vaadin.v7.client.widget.grid.AutoScroller;
+import com.vaadin.v7.client.widget.grid.AutoScroller.AutoScrollerCallback;
+import com.vaadin.v7.client.widget.grid.AutoScroller.ScrollAxis;
 import com.vaadin.v7.client.widget.grid.CellReference;
 import com.vaadin.v7.client.widget.grid.CellStyleGenerator;
 import com.vaadin.v7.client.widget.grid.DataAvailableEvent;
@@ -118,14 +120,12 @@ import com.vaadin.v7.client.widget.grid.DataAvailableHandler;
 import com.vaadin.v7.client.widget.grid.DefaultEditorEventHandler;
 import com.vaadin.v7.client.widget.grid.DetailsGenerator;
 import com.vaadin.v7.client.widget.grid.EditorHandler;
+import com.vaadin.v7.client.widget.grid.EditorHandler.EditorRequest;
 import com.vaadin.v7.client.widget.grid.EventCellReference;
 import com.vaadin.v7.client.widget.grid.HeightAwareDetailsGenerator;
 import com.vaadin.v7.client.widget.grid.RendererCellReference;
 import com.vaadin.v7.client.widget.grid.RowReference;
 import com.vaadin.v7.client.widget.grid.RowStyleGenerator;
-import com.vaadin.v7.client.widget.grid.AutoScroller.AutoScrollerCallback;
-import com.vaadin.v7.client.widget.grid.AutoScroller.ScrollAxis;
-import com.vaadin.v7.client.widget.grid.EditorHandler.EditorRequest;
 import com.vaadin.v7.client.widget.grid.events.AbstractGridKeyEventHandler;
 import com.vaadin.v7.client.widget.grid.events.AbstractGridMouseEventHandler;
 import com.vaadin.v7.client.widget.grid.events.BodyClickHandler;
@@ -165,11 +165,11 @@ import com.vaadin.v7.client.widget.grid.selection.MultiSelectionRenderer;
 import com.vaadin.v7.client.widget.grid.selection.SelectionEvent;
 import com.vaadin.v7.client.widget.grid.selection.SelectionHandler;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModel;
+import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Multi;
+import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Single;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModelMulti;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModelNone;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModelSingle;
-import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Multi;
-import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Single;
 import com.vaadin.v7.client.widget.grid.sort.Sort;
 import com.vaadin.v7.client.widget.grid.sort.SortEvent;
 import com.vaadin.v7.client.widget.grid.sort.SortHandler;
@@ -180,10 +180,10 @@ import com.vaadin.v7.client.widgets.Grid.Editor.State;
 import com.vaadin.v7.client.widgets.Grid.StaticSection.StaticCell;
 import com.vaadin.v7.client.widgets.Grid.StaticSection.StaticRow;
 import com.vaadin.v7.shared.ui.grid.GridConstants;
+import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 import com.vaadin.v7.shared.ui.grid.GridStaticCellType;
 import com.vaadin.v7.shared.ui.grid.HeightMode;
 import com.vaadin.v7.shared.ui.grid.ScrollDestination;
-import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 
 /**
  * A data grid view that supports columns and lazy loading of data rows from a
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java
index 8b0b6cfcaa..f488a03747 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java
@@ -25,13 +25,13 @@ import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.AbstractTextField;
 import com.vaadin.v7.ui.CheckBox;
 import com.vaadin.v7.ui.ComboBox;
-import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.InlineDateField;
-import com.vaadin.v7.ui.PopupDateField;
 import com.vaadin.v7.ui.ListSelect;
 import com.vaadin.v7.ui.NativeSelect;
 import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.PopupDateField;
 import com.vaadin.v7.ui.RichTextArea;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.TextField;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java
index 345d50614f..446c2b50ce 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java
@@ -22,9 +22,9 @@ import java.util.Comparator;
 import java.util.List;
 
 import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Sortable;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Container.Sortable;
 
 /**
  * Provides a default implementation of an ItemSorter. The
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java
index 8cc4e7ac10..45fc33ebba 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java
@@ -18,9 +18,9 @@ package com.vaadin.v7.data.util;
 import java.io.Serializable;
 
 import com.vaadin.data.sort.SortOrder;
+import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java
index b7b5a18f3d..53d9e03cb5 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java
@@ -15,8 +15,8 @@
  */
 package com.vaadin.v7.data.util.filter;
 
-import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
 
 /**
  * A compound {@link Filter} that accepts an item if all of its filters accept
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java
index ec0e468554..3599b017ff 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java
@@ -18,8 +18,8 @@ package com.vaadin.v7.data.util.filter;
 import java.util.Arrays;
 
 import com.vaadin.shared.util.SharedUtil;
-import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
 
 public class Between implements Filter {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java
index 5b945ff411..9724dc24b0 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java
@@ -15,9 +15,9 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Container.Filter;
 
 /**
  * Simple container filter comparing an item property value against a given
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java
index 0a7e115255..e9c6fbce97 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java
@@ -15,9 +15,9 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Container.Filter;
 
 /**
  * Simple container filter checking whether an item property value is null.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java
index 5d92271afe..97aa4d1a4d 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java
@@ -15,8 +15,8 @@
  */
 package com.vaadin.v7.data.util.filter;
 
-import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
 
 public class Like implements Filter {
     private final Object propertyId;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java
index d0680eb481..a5bb000a3f 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java
@@ -15,8 +15,8 @@
  */
 package com.vaadin.v7.data.util.filter;
 
-import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
 
 /**
  * Negating filter that accepts the items rejected by another filter.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java
index 5062e6d987..4782d85052 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java
@@ -15,8 +15,8 @@
  */
 package com.vaadin.v7.data.util.filter;
 
-import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
 
 /**
  * A compound {@link Filter} that accepts an item if any of its filters accept
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java
index b3f7d032e1..c4681f37c9 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java
@@ -15,9 +15,9 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Container.Filter;
 
 /**
  * Simple string filter for matching items that start with or contain a
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
index f522cef77a..35cbfee405 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
@@ -57,10 +57,10 @@ import com.vaadin.v7.data.Validator.InvalidValueException;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.util.converter.Converter.ConversionException;
+import com.vaadin.v7.data.util.converter.ConverterUtil;
 import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.shared.ui.combobox.FilteringMode;
 import com.vaadin.v7.shared.ui.select.AbstractSelectState;
-import com.vaadin.v7.data.util.converter.ConverterUtil;
 
 /**
  * <p>
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
index fe4d20c571..8777d8fc48 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
@@ -34,6 +34,7 @@ import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
@@ -44,7 +45,6 @@ import com.vaadin.v7.data.Validator.InvalidValueException;
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.validator.DateRangeValidator;
 import com.vaadin.v7.shared.ui.datefield.DateFieldConstants;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.shared.ui.datefield.TextualDateFieldState;
 
 /**
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
index 6c7de83fc2..5544520be5 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
@@ -101,15 +101,15 @@ import com.vaadin.v7.shared.ui.grid.EditorServerRpc;
 import com.vaadin.v7.shared.ui.grid.GridClientRpc;
 import com.vaadin.v7.shared.ui.grid.GridColumnState;
 import com.vaadin.v7.shared.ui.grid.GridConstants;
+import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 import com.vaadin.v7.shared.ui.grid.GridServerRpc;
 import com.vaadin.v7.shared.ui.grid.GridState;
 import com.vaadin.v7.shared.ui.grid.GridStaticCellType;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState;
-import com.vaadin.v7.shared.ui.grid.HeightMode;
-import com.vaadin.v7.shared.ui.grid.ScrollDestination;
-import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState.CellState;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState.RowState;
+import com.vaadin.v7.shared.ui.grid.HeightMode;
+import com.vaadin.v7.shared.ui.grid.ScrollDestination;
 import com.vaadin.v7.shared.ui.grid.selection.MultiSelectionModelServerRpc;
 import com.vaadin.v7.shared.ui.grid.selection.MultiSelectionModelState;
 import com.vaadin.v7.shared.ui.grid.selection.SingleSelectionModelServerRpc;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
index 62074a69db..be730af130 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java
@@ -22,7 +22,6 @@ import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.shared.ui.progressindicator.ProgressBarState;
-import com.vaadin.v7.ui.AbstractField;
 
 /**
  * Shows the current progress of a long running task.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
index 33b74df857..7dcfdff641 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
@@ -77,9 +77,9 @@ import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
 import com.vaadin.v7.shared.ui.table.CollapseMenuContent;
 import com.vaadin.v7.shared.ui.table.TableConstants;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 import com.vaadin.v7.shared.ui.table.TableServerRpc;
 import com.vaadin.v7.shared.ui.table.TableState;
-import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 
 /**
  * <p>
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java
index 7cd4cfb90e..6606d84b5f 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java
@@ -24,11 +24,11 @@ import org.junit.Test;
 
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.ComboBox;
-import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.InlineDateField;
-import com.vaadin.v7.ui.PopupDateField;
 import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.PopupDateField;
 import com.vaadin.v7.ui.TextField;
 
 public class DefaultFieldGroupFieldFactoryTest {
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java
index 76cf54b5e9..225f344045 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java
@@ -11,8 +11,8 @@ import java.util.TimeZone;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.DateRangeValidator;
 import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.v7.data.validator.DateRangeValidator;
 
 public class DateRangeValidatorTest {
     Calendar startDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
index 4def8caca7..12ac5ccca7 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java
@@ -10,8 +10,8 @@ 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.data.Validator.InvalidValueException;
-import com.vaadin.v7.data.util.converter.Converter.ConversionException;
 import com.vaadin.v7.data.util.MethodProperty;
+import com.vaadin.v7.data.util.converter.Converter.ConversionException;
 import com.vaadin.v7.data.util.converter.StringToIntegerConverter;
 import com.vaadin.v7.ui.TextField;
 
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java
index 73a13cef65..a5166f9373 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java
@@ -22,10 +22,10 @@ import java.util.Locale;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.util.ObjectProperty;
 import com.vaadin.v7.data.util.converter.Converter;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.DateField;
 
 public class DateFieldConverterTest {
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java
index cbfd2e1be7..e001a3327f 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java
@@ -21,8 +21,8 @@ import java.util.TimeZone;
 
 import org.junit.Test;
 
-import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.v7.ui.DateField;
 
 /**
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java
index 99f76cc746..e6316cec3f 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java
@@ -19,8 +19,8 @@ import java.util.Date;
 
 import org.junit.Test;
 
-import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.v7.ui.PopupDateField;
 
 /**
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java
index 08e77db859..a0e0cc6c16 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java
@@ -20,8 +20,8 @@ import java.util.EnumSet;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.v7.ui.Table.RowHeaderMode;
 import com.vaadin.v7.shared.ui.treetable.TreeTableState;
+import com.vaadin.v7.ui.Table.RowHeaderMode;
 import com.vaadin.v7.ui.TreeTable;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/Components.java b/uitest/src/main/java/com/vaadin/tests/Components.java
index 767084bc52..d16afa1232 100644
--- a/uitest/src/main/java/com/vaadin/tests/Components.java
+++ b/uitest/src/main/java/com/vaadin/tests/Components.java
@@ -13,6 +13,7 @@ import com.vaadin.server.ExternalResource;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Sizeable;
 import com.vaadin.shared.MouseEventDetails.MouseButton;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractComponentTest;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Component;
@@ -26,7 +27,6 @@ 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.shared.ui.label.ContentMode;
 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 76ade94d60..580faf9be3 100644
--- a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
@@ -16,6 +16,7 @@
 
 package com.vaadin.tests;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Component.Event;
@@ -27,7 +28,6 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.PasswordField;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Field;
 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 6d6ea68e3e..0be5305708 100644
--- a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
@@ -17,6 +17,7 @@
 package com.vaadin.tests;
 
 import com.vaadin.server.ClassResource;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.GridLayout;
@@ -27,7 +28,6 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 
 /**
  * This example demonstrates layouts. Layouts are populated with sample Vaadin
diff --git a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
index 9953caa723..4d60ea4279 100644
--- a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
@@ -20,9 +20,9 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import com.vaadin.server.LegacyApplication;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 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 8048c1997d..2617da651e 100644
--- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
@@ -20,13 +20,13 @@ import java.util.Date;
 import java.util.Map;
 
 import com.vaadin.server.UserError;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.TextField;
diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
index 9ca07e2579..44ec2927ab 100644
--- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java
@@ -18,11 +18,11 @@ package com.vaadin.tests;
 
 import java.util.Date;
 
+import com.vaadin.shared.ui.label.ContentMode;
 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.shared.ui.label.ContentMode;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
index dd3e1d8fda..5d22ddf2a4 100644
--- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
@@ -18,12 +18,12 @@ package com.vaadin.tests;
 
 import java.util.Date;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 
 public class PerformanceTestSubTreeCaching extends CustomComponent {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
index 1e5aca115f..43960ef70c 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
@@ -20,6 +20,7 @@ import com.vaadin.server.ClassResource;
 import com.vaadin.server.ErrorMessage;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.UserError;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
@@ -37,7 +38,6 @@ import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.NativeSelect;
 import com.vaadin.v7.ui.OptionGroup;
 import com.vaadin.v7.ui.ProgressIndicator;
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
index 76d146e7c3..5b1b5c7f06 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
@@ -19,6 +19,7 @@ package com.vaadin.tests;
 import java.util.Locale;
 
 import com.vaadin.server.Sizeable;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
@@ -30,7 +31,6 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.Table;
 
 public class TestForBasicApplicationLayout extends CustomComponent {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
index 845542c1d3..18db338f81 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
@@ -20,9 +20,9 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import com.vaadin.server.LegacyApplication;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 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/TestForRichTextEditor.java b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
index bfaf702258..5ad1032879 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
@@ -16,6 +16,7 @@
 
 package com.vaadin.tests;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.CustomComponent;
@@ -23,7 +24,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.RichTextArea;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
index cc694757cc..3f53686071 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
@@ -28,6 +28,7 @@ import java.lang.management.MemoryMXBean;
 
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.StreamResource;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
@@ -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.shared.ui.label.ContentMode;
 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 e9106caa7d..5014dcfac4 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
@@ -29,6 +29,7 @@ import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 
 import com.vaadin.server.StreamResource;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
@@ -44,7 +45,6 @@ import com.vaadin.ui.Upload.StartedEvent;
 import com.vaadin.ui.Upload.StartedListener;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.AbstractField;
 import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.v7.ui.Select;
diff --git a/uitest/src/main/java/com/vaadin/tests/TestIFrames.java b/uitest/src/main/java/com/vaadin/tests/TestIFrames.java
index f11e62c9c1..d04bbc7f4a 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestIFrames.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestIFrames.java
@@ -16,10 +16,10 @@
 
 package com.vaadin.tests;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 
 public class TestIFrames extends CustomComponent {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
index f648899a6b..7f5c6da809 100644
--- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
@@ -19,13 +19,13 @@ package com.vaadin.tests;
 import java.io.File;
 
 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.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Tree;
 import com.vaadin.v7.ui.Tree.ExpandEvent;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
index 6afc3326fe..d2058fd886 100644
--- a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
@@ -19,13 +19,13 @@ package com.vaadin.tests;
 import java.util.LinkedList;
 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.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Select;
 
 public class UsingObjectsInSelect extends com.vaadin.server.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 15cd30108e..c3ba0adb0b 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.application;
 
+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.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 
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 9c90e98ea0..fc1d249e26 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.ui.LegacyWindow;
 
 public class ChangeSessionId extends AbstractTestCase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java
index 9af17a6d9c..e2e9488a1a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java
@@ -7,6 +7,7 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinServlet;
 import com.vaadin.server.WebBrowser;
 import com.vaadin.shared.communication.PushMode;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.shared.ui.ui.Transport;
 import com.vaadin.shared.ui.ui.UIState.PushConfigurationState;
 import com.vaadin.ui.Button;
@@ -14,7 +15,6 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.Notification.Type;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.PushConfiguration;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
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 e1adf36056..f2d48a9ffa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
@@ -1,10 +1,10 @@
 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.shared.ui.label.ContentMode;
 
 /**
  *
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonMouseDetails.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonMouseDetails.java
index 8c166c33d6..1b6a81551a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonMouseDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonMouseDetails.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.button;
 
+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.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 
 public class ButtonMouseDetails 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 be1664bce3..0ca638fa19 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
@@ -21,6 +21,7 @@ import java.util.GregorianCalendar;
 
 import com.vaadin.event.Action;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalSplitPanel;
@@ -30,7 +31,6 @@ import com.vaadin.v7.data.fieldgroup.FieldGroup;
 import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.v7.data.util.BeanItem;
 import com.vaadin.v7.data.util.BeanItemContainer;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.Calendar;
 import com.vaadin.v7.ui.DateField;
 import com.vaadin.v7.ui.Table;
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 507d152b53..7bab92a513 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
@@ -26,6 +26,7 @@ import com.vaadin.annotations.Theme;
 import com.vaadin.data.Binder;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -46,7 +47,6 @@ import com.vaadin.v7.data.fieldgroup.FieldGroup;
 import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.v7.data.util.BeanItem;
 import com.vaadin.v7.shared.ui.combobox.FilteringMode;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.Calendar;
 import com.vaadin.v7.ui.Calendar.TimeFormat;
 import com.vaadin.v7.ui.ComboBox;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java
index 6a62e023f8..f4cc2e5560 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java
@@ -1,6 +1,7 @@
 package com.vaadin.tests.components.caption;
 
 import com.vaadin.server.ThemeResource;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.VaadinClasses;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
@@ -10,7 +11,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.ComboBox;
 
 public class IconsInCaption extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
index 3b3a9e87cb..950634039f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
@@ -29,6 +29,7 @@ import javax.imageio.ImageIO;
 import com.vaadin.server.StreamResource;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.colorpicker.Color;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.CheckBox;
@@ -38,7 +39,6 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.AbstractColorPicker;
 import com.vaadin.v7.ui.ColorPicker;
 import com.vaadin.v7.ui.ColorPickerArea;
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 2efe104b35..df666e0ad6 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,11 +1,11 @@
 package com.vaadin.tests.components.customcomponent;
 
+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.data.Property.ValueChangeEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.TextField;
 
 public class ClipContent extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormat.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormat.java
index e79cd4a054..579df7f1a8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormat.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormat.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.datefield;
 import java.util.Calendar;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class CustomDateFormat extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java
index 9be320ad79..575d68f291 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java
@@ -19,10 +19,10 @@ import java.util.Calendar;
 import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class CustomDateFormatEEE extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java
index 8bb08133a5..2a231e6534 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java
@@ -7,6 +7,7 @@ import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.DateField;
@@ -15,7 +16,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.NativeSelect;
 
 public class CustomDateFormats extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java
index 60dbbeed37..17b26b8288 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java
@@ -16,11 +16,11 @@
 package com.vaadin.tests.components.datefield;
 
 import com.vaadin.server.VaadinRequest;
+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.ui.Button.ClickListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java
index dd91d762c4..4a68e648e6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java
@@ -6,10 +6,10 @@ import java.util.Date;
 import java.util.TimeZone;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DateFieldDayResolutionOffset extends AbstractTestUI {
 
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 cdfb281623..2b660b8b0b 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
@@ -4,6 +4,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
@@ -13,8 +15,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
 import com.vaadin.v7.data.util.ObjectProperty;
-import com.vaadin.shared.ui.datefield.Resolution;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.PopupDateField;
 
 @SuppressWarnings("serial")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
index 9865a002d0..620b9cf12a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java
@@ -3,11 +3,11 @@ package com.vaadin.tests.components.datefield;
 import java.util.Calendar;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 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.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.InlineDateField;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldLocale.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldLocale.java
index 5c756a02c0..38bb02bc71 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldLocale.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldLocale.java
@@ -3,11 +3,11 @@ package com.vaadin.tests.components.datefield;
 import java.util.Date;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 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.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 
 public class DateFieldLocale extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldMinResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
index beb4caccdc..d153dff443 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldMinResolution.java
@@ -3,11 +3,11 @@ package com.vaadin.tests.components.datefield;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.InlineDateField;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DateFieldMinResolution extends TestBase {
 
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 1a2633f90b..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
@@ -3,12 +3,12 @@ package com.vaadin.tests.components.datefield;
 import java.util.Date;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DateFieldPopupOffScreen extends AbstractTestCase {
 
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 f8d2443d99..c6422891fb 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
@@ -4,12 +4,12 @@ import java.util.Date;
 import java.util.Locale;
 
 import com.vaadin.data.HasValue;
+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.util.BeanItem;
 import com.vaadin.v7.data.validator.RangeValidator;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.PopupDateField;
 
 public class DateFieldRangeValidation extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java
index 7a14e61057..d4912b7ebd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java
@@ -6,6 +6,7 @@ import java.util.Locale;
 
 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;
@@ -18,7 +19,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.NativeSelect;
 
 public class DateFieldRanges extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
index 7f7c96bfff..9addeca5cf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java
@@ -4,11 +4,11 @@ import java.util.Calendar;
 import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
+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.ui.Button.ClickListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 
 public class DateFieldReadOnly extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java
index d6c61b48f6..d8a165fa23 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java
@@ -7,9 +7,9 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
 import com.vaadin.ui.DateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DateFieldTest<T extends DateField>
         extends AbstractFieldTest<T, Date> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java
index 8c52fc1a08..33d1c659f0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java
@@ -8,13 +8,13 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.DateField;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.shared.ui.combobox.FilteringMode;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.ComboBox;
 
 public class DateFieldTimezone extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DatePopupStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DatePopupStyleName.java
index 214bd6f38d..64f8695308 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DatePopupStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DatePopupStyleName.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.datefield;
 import java.util.Date;
 
 import com.vaadin.server.UserError;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DatePopupStyleName extends TestBase {
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
index 65cd45c123..cd7026483a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.datefield;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.GridLayout;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java
index 543234a7cb..669d691634 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java
@@ -5,10 +5,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.InlineDateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 @SuppressWarnings("serial")
 public class InlineDateFields extends ComponentTestCase<InlineDateField> {
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 552a3e2648..2d0eeeee97 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,6 +6,7 @@ import java.util.Locale;
 
 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;
@@ -16,7 +17,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.DateField;
 import com.vaadin.v7.ui.InlineDateField;
 import com.vaadin.v7.ui.NativeSelect;
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 bf048a5163..7f3b3872dc 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,8 +7,8 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 
-import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.v7.ui.DateField;
 
 public class LegacyDateFieldTest<T extends DateField>
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java
index 89988681e4..72fed3605e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java
@@ -5,10 +5,10 @@ import java.util.Locale;
 
 import com.vaadin.data.HasValue.ValueChange;
 import com.vaadin.data.HasValue.ValueChangeListener;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.DateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class LenientMode extends TestBase implements ValueChangeListener<Date> {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java
index e791402137..a7d527b41e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java
@@ -21,11 +21,11 @@ import java.util.Date;
 import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
+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.ui.Button.ClickListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 
 public class LocaleChange extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java
index 02f5a2a037..16673fefe7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.datefield;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.InlineDateField;
 import com.vaadin.ui.PopupDateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 @SuppressWarnings("serial")
 public class LowResolution extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java
index 750c3263a8..94fefcb429 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java
@@ -16,10 +16,10 @@
 package com.vaadin.tests.components.datefield;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class PopupClosingWithEsc extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
index b5e57e76f2..2608e6e081 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java
@@ -4,11 +4,11 @@ import java.util.Calendar;
 import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
+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.ui.Button.ClickListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.PopupDateField;
 
 @SuppressWarnings("serial")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java
index fe476523b5..5933581a30 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java
@@ -4,9 +4,9 @@ import java.util.Calendar;
 import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.PopupDateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class PopupDateFieldLocaleTest extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
index 77d77d8087..8bb816181c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.datefield;
 import java.util.Calendar;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.PopupDateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class PopupDateFieldPopup extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
index 385190fa65..a65cf18d01 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
@@ -23,12 +23,12 @@ import java.util.Arrays;
 import java.util.Calendar;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.NativeSelect;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java
index 4223be2b7d..9bc567c0fc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java
@@ -5,10 +5,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.PopupDateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 @SuppressWarnings("serial")
 public class PopupDateFields extends ComponentTestCase<PopupDateField> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/TestDatefieldYear.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/TestDatefieldYear.java
index 9afc4ce35f..eb7545812e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/TestDatefieldYear.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/TestDatefieldYear.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.datefield;
 import java.util.Date;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class TestDatefieldYear extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
index af4d1e9ea7..cf42fcad75 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components.datefield;
 
 import java.util.Date;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 
 public class WidthRecalculationOnEnableStateChange extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java
index 9671b849f0..b3285e948c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java
@@ -27,11 +27,11 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.server.StreamVariable;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Html5File;
 import com.vaadin.ui.Label;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
index bec5eae949..fc27254539 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java
@@ -28,11 +28,11 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.server.FontAwesome;
 import com.vaadin.server.StreamVariable;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Html5File;
 import com.vaadin.ui.Label;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java
index 355afd3bcd..d2ca7700ad 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.components.gridlayout;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.InlineDateField;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 @SuppressWarnings("serial")
 public class GridLayoutCellSizesUI extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java b/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java
index c7f8f98289..0d296b1b92 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.label;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.label.ContentMode;
 
 public class Labels extends ComponentTestCase<Label> {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java
index 65f542bd27..b18b92dfc8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java
@@ -1,6 +1,7 @@
 package com.vaadin.tests.components.label;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractLayout;
 import com.vaadin.ui.Accordion;
@@ -8,7 +9,6 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 
 public class MarginsInLabels extends AbstractTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java
index 2bce0ac8c9..9c446befd9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.ListSelect;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
index c1c9a25548..d430774b91 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.optiongroup;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.OptionGroup;
 
 public class OptionGroupMultipleValueChange extends TestBase {
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 8011dcb971..fe8cafa1a1 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
@@ -10,6 +10,7 @@ import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractOrderedLayout;
@@ -25,7 +26,6 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.AbstractField;
 import com.vaadin.v7.ui.NativeSelect;
 import com.vaadin.v7.ui.TextField;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
index 56d99b7d03..931ebfa5e1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
@@ -1,6 +1,7 @@
 package com.vaadin.tests.components.orderedlayout;
 
 import com.vaadin.server.ThemeResource;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
@@ -12,7 +13,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.VerticalSplitPanel;
 import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 
 public class LayoutResizeTest extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldNotScroll.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
index d2f502d2c1..15ca0d521e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldNotScroll.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.panel;
 
+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.shared.ui.label.ContentMode;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.Label;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
index 9d79d94c9c..9e214e2598 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
@@ -3,6 +3,7 @@ package com.vaadin.tests.components.popupview;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.Button;
@@ -15,7 +16,6 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.PopupView;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.BaseTheme;
-import com.vaadin.shared.ui.label.ContentMode;
 
 public class PopupViewOffScreen extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
index 6d507315af..c3f99dff0a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java
@@ -4,8 +4,8 @@ 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.ProgressIndicator;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.ProgressIndicator;
 
 public class ProgressIndicatorInvisible extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java
index 3914351735..17a8c2ea51 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.richtextarea;
 
+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.ui.Label;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.RichTextArea;
 
 public class RichTextAreaEmptyString extends TestBase {
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 b0aef8ed9a..ae4c83e789 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
@@ -6,6 +6,7 @@ import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.HashMap;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.ui.Button;
@@ -15,7 +16,6 @@ import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Container;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.DefaultFieldFactory;
 import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.Table;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
index fc0e15aa40..c6cba16f91 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.components.table;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Window;
 import com.vaadin.v7.data.util.BeanItemContainer;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 
 public class HeaderRightClickAfterDrag extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java
index 92d353daa1..cb6509c110 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java
@@ -3,6 +3,7 @@ package com.vaadin.tests.components.table;
 import java.net.MalformedURLException;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.HorizontalLayout;
@@ -10,7 +11,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.Align;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java
index e8797cbae1..963038661a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java
@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.table;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 
 public class TableRowScrolledBottom extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
index 2377049b47..6439dfa64b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
@@ -9,13 +9,13 @@ import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.MultiSelectMode;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.select.AbstractSelectTestCase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.shared.ui.table.CollapseMenuContent;
 import com.vaadin.v7.shared.ui.table.TableConstants;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.Align;
 import com.vaadin.v7.ui.Table.CellStyleGenerator;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java
index 47aded8f38..aa4fee34f1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java
@@ -6,12 +6,12 @@ import com.vaadin.server.UIClassSelectionEvent;
 import com.vaadin.server.UICreateEvent;
 import com.vaadin.server.UIProviderEvent;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUIProvider;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Link;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 
 public class LazyInitUIs extends AbstractTestUIProvider {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java
index aecd5375eb..7f85b22fac 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java
@@ -26,12 +26,12 @@ import java.io.StringWriter;
 import java.util.Date;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 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.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 
 public class UISerialization extends AbstractTestUI {
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 6f5cfc932f..8184d10d85 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,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.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 
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 6dfda77a65..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
@@ -2,6 +2,7 @@ package com.vaadin.tests.components.window;
 
 import com.vaadin.server.Page.BrowserWindowResizeEvent;
 import com.vaadin.server.Page.BrowserWindowResizeListener;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.tests.util.LoremIpsum;
@@ -12,7 +13,6 @@ 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.shared.ui.label.ContentMode;
 
 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 c30857a786..3a46d8c299 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.ui.LegacyWindow;
 
 public class LegacyWindowOpenTest extends TestBase {
 
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 bbf824aa88..dd78f6e154 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.ui.LegacyWindow;
 import com.vaadin.v7.ui.Table;
 
 public class WindowScrollingUp extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java
index da05406ca4..5d30fa4f78 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java
@@ -14,9 +14,9 @@ import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
 import com.vaadin.ui.DragAndDropWrapper.WrapperTargetDetails;
 import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable;
-import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.event.DataBoundTransferable;
 
 public class AcceptAnythingWindow extends Window {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
index 020a8190a9..3b5ed8ee6c 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java
@@ -12,11 +12,11 @@ import com.vaadin.server.StreamVariable;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.AbsoluteLayout.ComponentPosition;
-import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.Html5File;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.event.DataBoundTransferable;
 
 /**
  * replacement for a proto class to keep tests working
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 29b22b4a76..7ba28c46f7 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
@@ -20,6 +20,7 @@ import java.util.Map;
 
 import com.vaadin.annotations.Theme;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.shared.util.SharedUtil;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Alignment;
@@ -43,7 +44,6 @@ import com.vaadin.v7.data.fieldgroup.PropertyId;
 import com.vaadin.v7.data.util.BeanItem;
 import com.vaadin.v7.data.util.BeanItemContainer;
 import com.vaadin.v7.data.validator.IntegerRangeValidator;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.TextField;
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 6b760d4a43..f09b790bc8 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
@@ -27,6 +27,7 @@ import com.vaadin.server.VaadinPortletService;
 import com.vaadin.server.VaadinPortletSession;
 import com.vaadin.server.VaadinPortletSession.PortletListener;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Link;
@@ -36,7 +37,6 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.Upload.Receiver;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.TextField;
 
 /**
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
index fad186ea0d..ba3716eec8 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java
@@ -1,9 +1,9 @@
 package com.vaadin.tests.layouts;
 
+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.shared.ui.label.ContentMode;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
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 7a4e132cf3..72be418a22 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java
@@ -1,5 +1,6 @@
 package com.vaadin.tests.layouts;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
@@ -11,7 +12,6 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.NativeSelect;
 import com.vaadin.v7.ui.TextField;
 
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 6db347ba9a..a07e97ab1f 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
@@ -16,13 +16,13 @@
 package com.vaadin.tests.layouts.layouttester.GridLayout;
 
 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.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.TextField;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
index 32fd52c633..9c7fe6378e 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
@@ -7,6 +7,7 @@ import com.vaadin.server.Page.Styles;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.colorpicker.Color;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
@@ -16,7 +17,6 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.ColorPicker;
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.TextArea;
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 65c4df06e8..73fec4026c 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 
 import com.vaadin.shared.communication.PushMode;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.shared.ui.ui.Transport;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
@@ -35,7 +36,6 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.NativeSelect;
 import com.vaadin.v7.ui.TextField;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java
index 7f2d42172e..fec4399d63 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java
@@ -7,11 +7,11 @@ import java.util.UUID;
 import com.vaadin.server.Page;
 import com.vaadin.server.Page.Styles;
 import com.vaadin.server.StreamResource;
+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.Label;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.TextArea;
 
 public class CSSInjectTest extends TestBase {
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 b06d93e12c..617ec7d584 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
@@ -10,6 +10,7 @@ import com.vaadin.annotations.Theme;
 import com.vaadin.data.Binder;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.calendar.CalendarTestEvent;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
@@ -32,7 +33,6 @@ import com.vaadin.v7.data.fieldgroup.FieldGroup;
 import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.v7.data.util.BeanItem;
 import com.vaadin.v7.shared.ui.combobox.FilteringMode;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.Calendar;
 import com.vaadin.v7.ui.Calendar.TimeFormat;
 import com.vaadin.v7.ui.ComboBox;
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
index 82f64f4c92..cae1dbc29b 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
@@ -21,6 +21,7 @@ import java.util.Locale;
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.server.UserError;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
@@ -35,7 +36,6 @@ import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.v7.data.fieldgroup.FieldGroup;
 import com.vaadin.v7.data.util.ObjectProperty;
 import com.vaadin.v7.data.util.PropertysetItem;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DateFields extends VerticalLayout implements View {
     public DateFields() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java
index 70a87faf0c..2bcbf1ab7a 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java
@@ -17,6 +17,7 @@ package com.vaadin.tests.themes.valo;
 
 import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
@@ -24,7 +25,6 @@ import com.vaadin.ui.PopupView;
 import com.vaadin.ui.PopupView.Content;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
-import com.vaadin.shared.ui.label.ContentMode;
 
 public class PopupViews extends VerticalLayout implements View {
     public PopupViews() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
index f8543d2aa6..db4e36e49a 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
@@ -34,6 +34,7 @@ import com.vaadin.server.ThemeResource;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.server.WebBrowser;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -55,7 +56,6 @@ import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
 import com.vaadin.v7.data.util.HierarchicalContainer;
 import com.vaadin.v7.data.util.IndexedContainer;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.NativeSelect;
 
 @Theme("tests-valo")
diff --git a/uitest/src/main/java/com/vaadin/tests/util/Log.java b/uitest/src/main/java/com/vaadin/tests/util/Log.java
index b8e6cccd91..54e266fa40 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/Log.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/Log.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.util;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 
 public class Log extends VerticalLayout {
     List<Label> eventLabels = new ArrayList<Label>();
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 fa898d708d..d2048b528f 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
@@ -21,11 +21,11 @@ import java.io.File;
 import com.vaadin.server.SystemError;
 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.shared.ui.label.ContentMode;
 
 /**
  * Provides sample directory based on application directory. If this fails then
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
index d2c5517554..745af93b11 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java
@@ -32,8 +32,8 @@ import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.extensions.AbstractExtensionConnector;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.tests.widgetset.server.SerializerTestExtension;
 import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.tests.widgetset.server.SerializerTestExtension;
 
 import elemental.json.Json;
 import elemental.json.JsonBoolean;
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java
index c15c1c6070..d4fccfc494 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorBasicClientFeaturesWidget.java
@@ -13,9 +13,9 @@ import com.vaadin.v7.client.widget.escalator.EscalatorUpdater;
 import com.vaadin.v7.client.widget.escalator.FlyweightCell;
 import com.vaadin.v7.client.widget.escalator.Row;
 import com.vaadin.v7.client.widget.escalator.RowContainer;
+import com.vaadin.v7.client.widget.escalator.RowContainer.BodyRowContainer;
 import com.vaadin.v7.client.widget.escalator.Spacer;
 import com.vaadin.v7.client.widget.escalator.SpacerUpdater;
-import com.vaadin.v7.client.widget.escalator.RowContainer.BodyRowContainer;
 import com.vaadin.v7.client.widgets.Escalator;
 import com.vaadin.v7.shared.ui.grid.ScrollDestination;
 
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
index 44b796b88d..f8c459efd8 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/EscalatorProxy.java
@@ -25,8 +25,8 @@ import com.vaadin.v7.client.widget.escalator.Cell;
 import com.vaadin.v7.client.widget.escalator.ColumnConfiguration;
 import com.vaadin.v7.client.widget.escalator.EscalatorUpdater;
 import com.vaadin.v7.client.widget.escalator.RowContainer;
-import com.vaadin.v7.client.widget.escalator.SpacerUpdater;
 import com.vaadin.v7.client.widget.escalator.RowContainer.BodyRowContainer;
+import com.vaadin.v7.client.widget.escalator.SpacerUpdater;
 import com.vaadin.v7.client.widgets.Escalator;
 
 public class EscalatorProxy extends Escalator {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
index 91c65cccaf..459a36865e 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
@@ -19,6 +19,7 @@ import java.util.Arrays;
 
 import com.vaadin.annotations.Widgetset;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.widgetset.TestingWidgetSet;
 import com.vaadin.tests.widgetset.client.grid.GridClientColumnRendererConnector.Renderers;
 import com.vaadin.tests.widgetset.client.grid.GridClientColumnRendererRpc;
@@ -31,7 +32,6 @@ import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.ui.AbstractSelect.ItemCaptionMode;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.NativeSelect;
 
 @Widgetset(TestingWidgetSet.NAME)
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java
index 16e5d59a48..ec66f3bc20 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java
@@ -1,13 +1,13 @@
 package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
-import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.shared.ui.textfield.ValueChangeMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.TextField;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 
 public class TextChangeEvents extends TestBase {
     Log l = new Log(10);
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java
index f59f5aeb38..6c4e1bbaf6 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java
@@ -4,13 +4,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.v7.event.FieldEvents.TextChangeEvent;
-import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
 import com.vaadin.v7.ui.TextField;
 
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
index 8cd6cbed8f..4005fff69f 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
@@ -1,11 +1,11 @@
 package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
-import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.v7.ui.TextField;
 
 public class TextChangeEventsWithNonImmediateValueChange extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
index 458ac5f265..bb391bc1c2 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
@@ -1,9 +1,9 @@
 package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
-import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.TestUtils;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
 import com.vaadin.v7.ui.TextField;
 
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java
index 8fe5757649..33d0894711 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java
@@ -16,10 +16,10 @@
 
 package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
-import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.TestUtils;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.v7.ui.AbstractTextField;
 import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.TextArea;
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java
index e546695844..bbb820d18a 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java
@@ -1,11 +1,11 @@
 package com.vaadin.v7.tests.components.textfield;
 
-import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
-import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 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.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
 import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
 import com.vaadin.v7.ui.TextField;
 
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java
index 2a98224789..fb6fe4492b 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java
@@ -1,8 +1,8 @@
 package com.vaadin.v7.tests.components.textfield;
 
+import com.vaadin.tests.components.TestBase;
 import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
 import com.vaadin.v7.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.components.TestBase;
 import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
 import com.vaadin.v7.ui.TextField;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
index 9b88cf396f..a05b7102e3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
@@ -20,10 +20,10 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.testbench.customelements.CalendarElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.CalendarElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class CalendarHtmlInEventsTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
index 04d4657718..a2abbc930f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
@@ -20,8 +20,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
-import com.vaadin.v7.testbench.customelements.ColorPickerElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ColorPickerElement;
 
 /**
  * Test for default caption behavior in color picker.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
index 3994f24080..e83a8bb126 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
@@ -19,8 +19,8 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * Test to check whether combobox is expanded when icon is clicked.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
index b19f8ae505..44c0d44e48 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
@@ -21,8 +21,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxClosePopupRetainTextTest extends MultiBrowserTest {
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
index 07724ad016..6a0e56e059 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
@@ -24,8 +24,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxInputPromptTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
index cc52fff69f..13f4414115 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
@@ -22,8 +22,8 @@ import org.junit.Test;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxItemAddingWithFocusListenerTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
index 8dc50ce0c0..22335c953a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
@@ -22,8 +22,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxItemStyleGeneratorTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
index 4d2cc61b55..b51aed8d2a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
@@ -5,9 +5,9 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class ComboBoxLargeIconsTest extends MultiBrowserTest {
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
index e43447e6b2..b2e9290f37 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
@@ -27,8 +27,8 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * When pressed down key, while positioned on the last item - should show next
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
index 60977d8ca2..7de663f1e4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.commands.TestBenchElementCommands;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * ComboBox should clear its value when setting to null with new items.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
index 2b606f1eae..060a6a2a7d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
@@ -25,8 +25,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class ComboBoxSuggestionPageLengthTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
index 8f246f211f..9be6f28dae 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
@@ -24,8 +24,8 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * @author Vaadin Ltd
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
index e95f6ad7b1..0d1c9284eb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
@@ -25,9 +25,9 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.VerticalLayoutElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * Tests ComboBox inputs and selections.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
index fd8eb1b054..386621858b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
@@ -20,9 +20,9 @@ import static org.hamcrest.Matchers.is;
 
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 @SuppressWarnings("serial")
 public class ComboSelectedValueBeyondTheFirstDropdownPageTest
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
index 420ea32ce7..8c6f7d68d5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
@@ -21,9 +21,9 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.MenuBarElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * Test that checks whether Combobox popup is closed on click to autoopen
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
index 90b31ea12a..0de930f882 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 /**
  * Tests that changing a stylename will not cause the width parameter to be
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
index 226da41641..51b1addba0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
@@ -21,9 +21,9 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
+import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.v7.testbench.customelements.NativeSelectElement;
-import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class FilteringTurkishLocaleTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java
index f297110b00..23aca038ae 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldChangeResolutionTest.java
@@ -24,9 +24,9 @@ import org.junit.Test;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.testbench.By;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DateFieldChangeResolutionTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
index 6e6daf5db2..7f9614fd9f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.FormLayoutElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserThemeTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class FormLayoutResizingTest extends MultiBrowserThemeTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
index 4f22aa8c5c..bc6b42b511 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
@@ -7,8 +7,8 @@ import org.junit.Test;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableInFormLayoutCausesScrollingTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java
index 69debf19b2..d03ca79205 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java
@@ -21,7 +21,6 @@ import java.util.List;
 
 import org.junit.Test;
 
-
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
index 2a05e7a193..c2399ce9cb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
@@ -19,7 +19,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java
index f9ba51b331..5e0793dbd2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java
@@ -19,7 +19,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
index 44a9ee3b15..a0b4b51eeb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
@@ -31,13 +31,13 @@ import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.elements.NativeButtonElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.widgetset.client.grid.GridClientColumnRendererConnector.Renderers;
 import com.vaadin.tests.widgetset.server.grid.GridClientColumnRenderers;
 import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 /**
  * Tests Grid client side renderers
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java
index 77aac67135..c2c740a5f9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
index 6c43a1baef..12f98979fa 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
@@ -21,7 +21,6 @@ import org.junit.Test;
 import org.openqa.selenium.Dimension;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
index d389d6ab94..e9a8892628 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
@@ -21,13 +21,12 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 @TestCategory("grid")
 public class GridColumnWidthsWithoutDataTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
index 08406ac571..0a14c57fa0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
@@ -22,7 +22,6 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
index 6c7694b81f..0ba591076c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
index f00be81a76..ddd0bcb7aa 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
index eccdf8e630..897566500a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.TestCategory;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
index 14ec039f43..d2e078db8c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
@@ -22,7 +22,6 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
index dac5fce68a..e747fe034e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.interactions.Actions;
 
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
index 5997a77c65..37cb978ffc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
index 43af0ed1c9..21dad915eb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
@@ -24,7 +24,6 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
index 5360b5f918..a66cf2fb9c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
@@ -7,7 +7,6 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java
index b8b69e238d..de80c5fcc5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java
@@ -26,7 +26,6 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
index b04e34dd4e..6298153999 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.parallel.TestCategory;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
index b3d011a4f5..59d53c5a26 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
@@ -20,7 +20,6 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
index 41f9d72267..ad293fe385 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
@@ -27,11 +27,10 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
-
-import com.vaadin.v7.testbench.customelements.OptionGroupElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.v7.testbench.customelements.OptionGroupElement;
 
 /**
  * Tests that Grid gets correct height based on height mode, and resizes
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java
index 8383536d99..9aba286c5a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertFalse;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.testbench.elements.TabSheetElement;
 import com.vaadin.testbench.parallel.TestCategory;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java
index a607297f11..570ca4a5a7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
index 4acac627ac..1e370b7e8c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
@@ -22,7 +22,6 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
index 962e8f392a..575ae8e95f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
@@ -21,7 +21,6 @@ import static org.hamcrest.number.IsCloseTo.closeTo;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
-
 import com.vaadin.testbench.elements.GridLayoutElement;
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.TestCategory;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
index 960f85b35e..7f52ba3be4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
@@ -19,7 +19,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
index d28bb46bbc..63af9e6dce 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
@@ -18,7 +18,6 @@ package com.vaadin.tests.components.grid;
 import org.junit.Assert;
 import org.junit.Test;
 
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
index ee84187af0..ccf54a5f47 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
@@ -25,7 +25,6 @@ import org.openqa.selenium.Dimension;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java
index 496f335e01..766b14adcc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java
@@ -8,10 +8,9 @@ import java.util.List;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
-
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class GridRowHeightChangeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
index eabbaa3234..db2a558637 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
@@ -10,7 +10,6 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
index a63dc5374f..23dd6f6ff5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
@@ -24,7 +24,6 @@ import org.openqa.selenium.Dimension;
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;
 
-
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
index b69d762313..82b1b74617 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
index b43b8a353c..fc716621e3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
@@ -21,7 +21,6 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.SearchContext;
 
 import com.vaadin.testbench.TestBenchElement;
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.minitutorials.v7_5.ShowingExtraDataForRows;
 import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
index 3265e29506..b596c35d41 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
@@ -19,7 +19,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.CheckBoxElement;
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java
index 46520d9f06..b855b74a75 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java
@@ -21,7 +21,6 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
index 453c02a064..f016f7ce70 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
index dc706c369f..b8ed9d4ce2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
@@ -18,7 +18,6 @@ package com.vaadin.tests.components.grid;
 import org.junit.Assert;
 import org.junit.Test;
 
-
 import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
index 13554bc36d..3bf1301a6e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
@@ -18,7 +18,6 @@ package com.vaadin.tests.components.grid;
 import org.junit.Assert;
 import org.junit.Test;
 
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java
index 52e66331f2..a8b4b1ca98 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java
@@ -18,7 +18,6 @@ package com.vaadin.tests.components.grid;
 import org.junit.Assert;
 import org.junit.Test;
 
-
 import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java
index 2893ed95d9..1e5b03b16e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-
 import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
index d80d147e73..001c4d2322 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
@@ -19,7 +19,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java
index 9966eafc84..f8b7705143 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java
@@ -18,7 +18,6 @@ package com.vaadin.tests.components.grid;
 import org.junit.Assert;
 import org.junit.Test;
 
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
index da9a72e6a7..fce9878276 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
@@ -18,9 +18,9 @@ package com.vaadin.tests.components.grid;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.OptionGroupElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.v7.testbench.customelements.OptionGroupElement;
 
 public class SortableHeaderStylesTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
index d9dfc783dd..922b43e4dc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
@@ -19,7 +19,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
index 923592fc31..f20b40b622 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorBufferedTest.java
@@ -31,8 +31,8 @@ import org.openqa.selenium.interactions.Actions;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.GridElement.GridEditorElement;
-import com.vaadin.v7.shared.ui.grid.GridConstants;
 import com.vaadin.testbench.elements.NotificationElement;
+import com.vaadin.v7.shared.ui.grid.GridConstants;
 
 public class GridEditorBufferedTest extends GridEditorTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
index 424d62a712..2c018bccb2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
@@ -31,7 +31,6 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
-
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
 import com.vaadin.testbench.elements.NotificationElement;
 import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
index 5d81feb576..488a9d61d9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
@@ -22,7 +22,6 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 
-
 import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
 import com.vaadin.v7.testbench.customelements.GridElement;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
index 09e149507f..bd279a4367 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
@@ -21,8 +21,8 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.ListSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.ListSelectElement;
 
 public class ListSelectAddRemoveItemsTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
index 08066e9d8c..28cc52133c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
@@ -24,8 +24,8 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.ListSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.ListSelectElement;
 
 public class ListSelectNoDomRebuildTest extends SingleBrowserTest {
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
index be2d04f915..3679794c0c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.Select;
 
 import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
 import com.vaadin.v7.testbench.customelements.ListSelectElement;
 import com.vaadin.v7.testbench.customelements.OptionGroupElement;
-import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
 
 public class ListSelectPushSelectionChangesTest
         extends SingleBrowserTestPhantomJS2 {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java
index 246c7aa09d..7a687cbaaa 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.nativeselect;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class NativeSelectNullTest extends SingleBrowserTestPhantomJS2 {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
index 518e9b40e1..cd45f553f4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
@@ -20,9 +20,9 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 public class NativeSelectsFocusAndBlurListenerTests extends MultiBrowserTest {
 
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 8ce35fcc73..e9c3bc799c 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
@@ -22,11 +22,11 @@ import org.openqa.selenium.WebElement;
 import com.vaadin.shared.ui.ui.NotificationRole;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.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.StringToEnumConverter;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 /**
  * Unit test class for Notification ARIA (Accessible Rich Internet Applications)
diff --git a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
index e2d5337238..f7f5c7196b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
@@ -22,9 +22,9 @@ import org.junit.Test;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.v7.testbench.customelements.NativeSelectElement;
-import com.vaadin.tests.tb3.SingleBrowserTest;
 
 public class EnumSelectTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
index 49b0f2fe0f..998f166b7f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.select;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.ListSelectElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.ListSelectElement;
 
 public class SelectWithIntegersTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
index 1d32dd585c..1b128de75e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
@@ -21,8 +21,8 @@ import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if VScrollTable handles Push updates correctly.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
index 476b53b497..4700d43d3a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
@@ -9,9 +9,9 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TableHeaderElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ColumnReorderingWithManyColumnsTest extends MultiBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
index b40a085af4..b2906feb7a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
@@ -11,8 +11,8 @@ import org.openqa.selenium.NoSuchElementException;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ContainerSizeChangeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
index e1bb5db8ee..ef1ea807d5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
@@ -9,8 +9,8 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class DisabledSortingTableTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
index 0d1e39e36e..9b37f36106 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
@@ -26,8 +26,8 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that editing and selecting work correctly.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
index 5134ac0461..1f61c0be7d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
@@ -21,8 +21,8 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if the correct row gets the focus when the row is selected from
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
index cb28fc9f0a..6a3309bf17 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
@@ -25,9 +25,9 @@ import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
index c6ccab066b..9768aa239b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
@@ -27,9 +27,9 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
index 81e263b1df..46f0d8c135 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
@@ -23,9 +23,9 @@ import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
index f99ec796d1..f12d68f226 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
@@ -23,8 +23,8 @@ import java.util.Arrays;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
index f9f4189444..3f8498034a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
@@ -20,8 +20,8 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
index fc9f525b81..c70d6075e6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
@@ -22,9 +22,9 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.WindowElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests whether right-click on a column header works after the column is
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
index ad4dbee4b1..9e60fd865a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
@@ -20,8 +20,8 @@ import java.io.IOException;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
index a97c6808ee..d78c08678f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
@@ -21,8 +21,8 @@ import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table Footer ClickListener
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
index fd351bda3f..1037794e30 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
@@ -24,8 +24,8 @@ import org.junit.Test;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ItemClickEventsTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
index 2bbed3a2c1..b0c053e55b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
@@ -28,9 +28,9 @@ import org.openqa.selenium.remote.DesiredCapabilities;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ItemClickEventsTestWithShiftOrCtrl extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
index 4ed014988d..f22bcd459d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests clicks on different types of Table contents.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
index 94f7542998..c7806e1694 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
@@ -11,8 +11,8 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class LongMultiselectTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
index 109c4f110a..386549b098 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test case creating and deleting table component in a loop, testing memory
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
index eee8fa4adc..1ae9adebbf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
@@ -9,8 +9,8 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class ReloadWidgetsTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
index c5d5b5241e..219c6b1c49 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
@@ -27,8 +27,8 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class SelectAllConstantViewportTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
index 655cbd6741..f77403c957 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
@@ -32,8 +32,8 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if all items of the table can be selected by selecting first row,
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
index b502280ae3..90ed3da93e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class SelectableEditableTest extends MultiBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
index dc09923065..4803e86e39 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
@@ -24,8 +24,8 @@ import org.openqa.selenium.NoSuchElementException;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 import junit.framework.Assert;
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
index 7840467460..df61c13630 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
@@ -19,8 +19,8 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests sorting labels in table.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
index 9557bd9e6e..f85d1c870b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
@@ -18,9 +18,9 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.vaadin.tests.tb3.SingleBrowserTest;
 import com.vaadin.v7.testbench.customelements.OptionGroupElement;
 import com.vaadin.v7.testbench.customelements.TableElement;
-import com.vaadin.tests.tb3.SingleBrowserTest;
 
 public class SortableHeaderStylesTest extends SingleBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
index a26ac1fd88..7ff937aad7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
@@ -24,8 +24,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableBlurFocusTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
index 8b3c7557d7..aa4e748edc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that clicking on active fields doesn't change Table selection, nor does
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
index 0442594d16..ac3f109f1f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
@@ -22,8 +22,8 @@ import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.NotificationElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableColumnAddAndResizeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
index e98c223330..e0fd37df0d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
@@ -27,8 +27,8 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that components within table cells get resized when their column gets
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
index 9903739644..5913e08868 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.table;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableColumnWidthsAndSortingTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
index 8e22e2ab38..7def9cbe43 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
@@ -7,8 +7,8 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableContextMenuAndIconsTest extends MultiBrowserTest {
     @Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
index ecda384a19..a642b49681 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
@@ -21,9 +21,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TableHeaderElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableDragColumnTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
index c9935775f3..87b4e2d69f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
@@ -23,8 +23,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that clicking on active fields doesn't change Table selection, nor does
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
index 87501cb774..46f24bdc2c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * For testing that UI scroll does not jump back to up when: 1. UI is in iframe
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
index 5a2fd1163e..17726f6921 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.interactions.Actions;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.TooltipTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests Table tooltips with various settings.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
index 56503584b2..77c63f153f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
@@ -29,9 +29,9 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that navigation with PageDown/PageUp/Home/End in Table works
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
index 1eea1ef91e..91872a9439 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
@@ -19,9 +19,9 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TableRowElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableParentEnabledStateChangeTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
index 05131cced5..57666944c4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
@@ -21,8 +21,8 @@ import static org.hamcrest.number.IsCloseTo.closeTo;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Scroll position should be restored when removing and re-adding all rows in
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
index 763f79f947..956dbee1cf 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
@@ -22,8 +22,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that rows are completely visible and clicking buttons doesn't change
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
index 715cf51c7f..2a0842dd75 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that adding long labels to a Table and scrolling to the bottom works as
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
index 1e892274ce..ed1ac464ed 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
@@ -22,8 +22,8 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test to see if Table appears to scroll up under an obscure set of conditions
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
index cf5220abb0..04e7751519 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
@@ -4,8 +4,8 @@ import java.io.IOException;
 
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableScrollsOnSelectionTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
index 4b9869049e..ad630eb3a7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
@@ -5,8 +5,8 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableSetUndefinedSizeTest extends MultiBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
index c3de92d705..6328820c5e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
@@ -19,8 +19,8 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests if the sort indicator is visible after the table has been sorted from
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
index 6ba6d70d33..fca736e13e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
@@ -20,9 +20,9 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TableHeaderElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Tests that column keeps its header, icon, alignment after toggling visibility
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
index 9f68aa6ecd..4d70818472 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test for a Table with a customised BeanItemContainer.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
index a7c01f5e3d..2d64ab435c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
@@ -21,8 +21,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class TableWithPollingTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
index 1914c09f52..4ce1a2a630 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
@@ -24,8 +24,8 @@ import org.junit.Test;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class UpdateTableWhenUnfocusedTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
index 857ad95e95..fc11db0284 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
@@ -23,8 +23,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.v7.testbench.customelements.TreeElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.TreeElement;
 
 public class TreeHtmlContentAllowedTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
index 4cdbb6b8a7..7f1162ee84 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
@@ -21,8 +21,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests that expanded cells with component contents aren't empty.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
index 1636fed769..9ab67bade8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
@@ -22,8 +22,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests that TreeTable with ContainerHierarchicalWrapper is updated correctly
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
index b3d96356db..9f90dd5fc3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
@@ -24,8 +24,8 @@ import org.junit.Test;
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 import com.vaadin.tests.tb3.TooltipTest;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests TreeTable tooltips with various settings.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
index d3faa80017..ce64913289 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests that opening the root node and clicking a generated component doesn't
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
index 4afdcdfbcd..fbf8947ba9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
@@ -24,8 +24,8 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests expanding TreeTable rows when page length is zero.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
index d14c0b1cd0..4b2694607d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
@@ -27,8 +27,8 @@ import org.openqa.selenium.support.ui.ExpectedConditions;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.commands.TestBenchElementCommands;
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 /**
  * Tests partial updates of a TreeTable.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
index 76d8337092..e9b974a920 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
@@ -23,8 +23,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.testbench.customelements.TreeTableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
 
 public class TreeTableScrollOnExpandTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
index e00c49ae1a..61ea600b91 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 public class TextAreaEventPropagationModifierKeysTest extends MultiBrowserTest {
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
index 2ac943b0f2..e7496a8ce6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
@@ -22,9 +22,9 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 /**
  * Tests that the TextArea widget correctly stops ENTER events from propagating.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
index 7a9bd5e818..b8baaff102 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
@@ -12,11 +12,11 @@ import com.vaadin.testbench.customelements.DateFieldElement;
 import com.vaadin.testbench.customelements.FixedNotificationElement;
 import com.vaadin.testbench.customelements.WindowElement;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.TabSheetElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public abstract class ThemeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
index 61efcc2a9f..4c14a370e2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
@@ -20,8 +20,8 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 public class OpenModalWindowAndFocusFieldTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
index 95ae5aba84..cc27555638 100644
--- a/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
@@ -9,8 +9,8 @@ import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 
 public class TableQueryWithNonUniqueFirstPrimaryKeyTest
         extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java b/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
index 9193cba6a2..ca19fdfa42 100644
--- a/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
@@ -8,8 +8,8 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.v7.testbench.customelements.TreeElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TreeElement;
 
 public class DnDOnSubtreeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
index 479795e18c..b06331f781 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
@@ -22,9 +22,9 @@ import org.junit.Test;
 
 import com.vaadin.testbench.AbstractHasTestBenchCommandExecutor;
 import com.vaadin.testbench.elements.AbstractComponentElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class BasicCrudTableTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
index 55c8885891..33841a13ea 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
@@ -24,8 +24,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.ParameterizedTB3Runner;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Base class for servlet integration tests. Automatically prepends "/demo" to
diff --git a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
index fd9a8163b0..e55cc36e3e 100644
--- a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
@@ -8,10 +8,10 @@ import org.junit.Test;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.elements.TableRowElement;
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class NavigationTest extends SingleBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
index 0e9dd0ca83..2ba0389f55 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
@@ -21,9 +21,9 @@ import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
-import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
 
 @TestCategory("push")
 abstract class PushConfigurationTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
index 7bb4a72ce4..3026aa25a0 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.push;
 import org.junit.Test;
 
 import com.vaadin.testbench.By;
-import com.vaadin.v7.testbench.customelements.TextAreaElement;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TextAreaElement;
 
 @TestCategory("push")
 public abstract class SendMultibyteCharactersTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
index 2d6985fd8d..f54cf722ea 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
@@ -24,13 +24,13 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.v7.testbench.customelements.ComboBoxElement;
 import com.vaadin.testbench.elements.EmbeddedElement;
 import com.vaadin.testbench.elements.MenuBarElement;
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 public class LegacyComponentThemeChangeTest extends MultiBrowserTest {
 
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
index de695cdf96..eaae1acfd8 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
@@ -22,8 +22,8 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.v7.testbench.customelements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
 
 /**
  * Test for non-collapsible column opacity for item in column configuration
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
index ae0c2009ac..1c654b8108 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 
-import com.vaadin.v7.testbench.customelements.ColorPickerElement;
 import com.vaadin.tests.components.colorpicker.DefaultCaptionWidthTest;
+import com.vaadin.v7.testbench.customelements.ColorPickerElement;
 
 /**
  * Test for default caption behavior in color picker using Valo theme.