Move and rename server classes which go into the compatibility package

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

Change-Id: I19a27f3835b18980b91a4f8f9464b2adde1a5fd5

135 files changed, 950 insertions, 942 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java
index 96e4621761..bee3f7c80b 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java
@@ -13,29 +13,29 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.beans.IntrospectionException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.util.BeanUtil;
-import com.vaadin.v7.data.validator.LegacyBeanValidator;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.validator.BeanValidator;
+import com.vaadin.v7.ui.Field;
 
 public class BeanFieldGroup<T> extends FieldGroup {
 
     private final Class<T> beanType;
 
     private static Boolean beanValidationImplementationAvailable = null;
-    private final Map<LegacyField<?>, LegacyBeanValidator> defaultValidators;
+    private final Map<Field<?>, BeanValidator> defaultValidators;
 
     public BeanFieldGroup(Class<T> beanType) {
         this.beanType = beanType;
-        this.defaultValidators = new HashMap<LegacyField<?>, LegacyBeanValidator>();
+        this.defaultValidators = new HashMap<Field<?>, BeanValidator>();
     }
 
     @Override
@@ -150,35 +150,35 @@ public class BeanFieldGroup<T> extends FieldGroup {
     }
 
     @Override
-    public void bind(LegacyField field, Object propertyId) {
+    public void bind(Field field, Object propertyId) {
         ensureNestedPropertyAdded(propertyId);
         super.bind(field, propertyId);
     }
 
     @Override
-    public <T extends LegacyField> T buildAndBind(String caption,
+    public <T extends Field> T buildAndBind(String caption,
             Object propertyId, Class<T> fieldType) throws BindException {
         ensureNestedPropertyAdded(propertyId);
         return super.buildAndBind(caption, propertyId, fieldType);
     }
 
     @Override
-    public void unbind(LegacyField<?> field) throws BindException {
+    public void unbind(Field<?> field) throws BindException {
         super.unbind(field);
 
-        LegacyBeanValidator removed = defaultValidators.remove(field);
+        BeanValidator removed = defaultValidators.remove(field);
         if (removed != null) {
             field.removeValidator(removed);
         }
     }
 
     @Override
-    protected void configureField(LegacyField<?> field) {
+    protected void configureField(Field<?> field) {
         super.configureField(field);
         // Add Bean validators if there are annotations
         if (isBeanValidationImplementationAvailable()
                 && !defaultValidators.containsKey(field)) {
-            LegacyBeanValidator validator = new LegacyBeanValidator(beanType,
+            BeanValidator validator = new BeanValidator(beanType,
                     getPropertyId(field).toString());
             field.addValidator(validator);
             if (field.getLocale() != null) {
@@ -227,7 +227,7 @@ public class BeanFieldGroup<T> extends FieldGroup {
      * @param bean
      *            the bean to be bound
      * @param objectWithMemberFields
-     *            the class that contains {@link LegacyField}s for bean
+     *            the class that contains {@link Field}s for bean
      *            properties
      * @return the bean field group used to make binding
      */
@@ -249,7 +249,7 @@ public class BeanFieldGroup<T> extends FieldGroup {
      * @param bean
      *            the bean to be bound
      * @param objectWithMemberFields
-     *            the class that contains {@link LegacyField}s for bean
+     *            the class that contains {@link Field}s for bean
      *            properties
      * @return the bean field group used to make binding
      */
diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/Caption.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/Caption.java
index d752aa78d2..0042cd8113 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/Caption.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/Caption.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java
index 24c97eedc5..8b0b6cfcaa 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java
@@ -13,28 +13,28 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.util.Date;
 import java.util.EnumSet;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.fieldgroup.FieldGroup.BindException;
-import com.vaadin.ui.AbstractSelect;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.OptionGroup;
-import com.vaadin.ui.RichTextArea;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyAbstractTextField;
-import com.vaadin.v7.ui.LegacyCheckBox;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyInlineDateField;
-import com.vaadin.v7.ui.LegacyPopupDateField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.BindException;
+import com.vaadin.v7.ui.AbstractField;
+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.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.RichTextArea;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
 
 /**
  * This class contains a basic implementation for {@link FieldGroupFieldFactory}
@@ -64,8 +64,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
     }
 
     @Override
-    public <T extends LegacyField> T createField(Class<?> type,
-            Class<T> fieldType) {
+    public <T extends Field> T createField(Class<?> type, Class<T> fieldType) {
         if (Enum.class.isAssignableFrom(type)) {
             return createEnumField(type, fieldType);
         } else if (Date.class.isAssignableFrom(type)) {
@@ -74,9 +73,9 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
                 || boolean.class.isAssignableFrom(type)) {
             return createBooleanField(fieldType);
         }
-        if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) {
+        if (AbstractTextField.class.isAssignableFrom(fieldType)) {
             return fieldType.cast(createAbstractTextField(
-                    fieldType.asSubclass(LegacyAbstractTextField.class)));
+                    fieldType.asSubclass(AbstractTextField.class)));
         } else if (fieldType == RichTextArea.class) {
             return fieldType.cast(createRichTextArea());
         }
@@ -90,7 +89,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
         return rta;
     }
 
-    private <T extends LegacyField> T createEnumField(Class<?> type,
+    private <T extends Field> T createEnumField(Class<?> type,
             Class<T> fieldType) {
         // Determine first if we should (or can) create a select for the enum
         Class<AbstractSelect> selectClass = null;
@@ -104,26 +103,26 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
             AbstractSelect s = createCompatibleSelect(selectClass);
             populateWithEnumData(s, (Class<? extends Enum>) type);
             return (T) s;
-        } else if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) {
+        } else if (AbstractTextField.class.isAssignableFrom(fieldType)) {
             return (T) createAbstractTextField(
-                    (Class<? extends LegacyAbstractTextField>) fieldType);
+                    (Class<? extends AbstractTextField>) fieldType);
         }
 
         return null;
     }
 
-    private <T extends LegacyField> T createDateField(Class<?> type,
+    private <T extends Field> T createDateField(Class<?> type,
             Class<T> fieldType) {
-        LegacyAbstractField field;
+        AbstractField field;
 
-        if (LegacyInlineDateField.class.isAssignableFrom(fieldType)) {
-            field = new LegacyInlineDateField();
+        if (InlineDateField.class.isAssignableFrom(fieldType)) {
+            field = new InlineDateField();
         } else if (anyField(fieldType)
-                || LegacyDateField.class.isAssignableFrom(fieldType)) {
-            field = new LegacyPopupDateField();
-        } else if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) {
+                || DateField.class.isAssignableFrom(fieldType)) {
+            field = new PopupDateField();
+        } else if (AbstractTextField.class.isAssignableFrom(fieldType)) {
             field = createAbstractTextField(
-                    (Class<? extends LegacyAbstractTextField>) fieldType);
+                    (Class<? extends AbstractTextField>) fieldType);
         } else {
             return null;
         }
@@ -163,8 +162,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
      * @return true if any LegacyAbstractField can be assigned to the field
      */
     protected boolean anyField(Class<?> fieldType) {
-        return fieldType == LegacyField.class
-                || fieldType == LegacyAbstractField.class;
+        return fieldType == Field.class || fieldType == AbstractField.class;
     }
 
     /**
@@ -173,27 +171,27 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
      *            the type of the field
      * @return true if any AbstractSelect can be assigned to the field
      */
-    protected boolean anySelect(Class<? extends LegacyField> fieldType) {
+    protected boolean anySelect(Class<? extends Field> fieldType) {
         return anyField(fieldType) || fieldType == AbstractSelect.class;
     }
 
-    protected <T extends LegacyField> T createBooleanField(Class<T> fieldType) {
-        if (fieldType.isAssignableFrom(LegacyCheckBox.class)) {
-            LegacyCheckBox cb = new LegacyCheckBox(null);
+    protected <T extends Field> T createBooleanField(Class<T> fieldType) {
+        if (fieldType.isAssignableFrom(CheckBox.class)) {
+            CheckBox cb = new CheckBox(null);
             cb.setImmediate(true);
             return (T) cb;
-        } else if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) {
+        } else if (AbstractTextField.class.isAssignableFrom(fieldType)) {
             return (T) createAbstractTextField(
-                    (Class<? extends LegacyAbstractTextField>) fieldType);
+                    (Class<? extends AbstractTextField>) fieldType);
         }
 
         return null;
     }
 
-    protected <T extends LegacyAbstractTextField> T createAbstractTextField(
+    protected <T extends AbstractTextField> T createAbstractTextField(
             Class<T> fieldType) {
-        if (fieldType == LegacyAbstractTextField.class) {
-            fieldType = (Class<T>) LegacyTextField.class;
+        if (fieldType == AbstractTextField.class) {
+            fieldType = (Class<T>) TextField.class;
         }
         try {
             T field = fieldType.newInstance();
@@ -218,11 +216,10 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory {
      * @return A field capable of editing the data or null if no field could be
      *         created
      */
-    protected <T extends LegacyField> T createDefaultField(Class<?> type,
+    protected <T extends Field> T createDefaultField(Class<?> type,
             Class<T> fieldType) {
-        if (fieldType.isAssignableFrom(LegacyTextField.class)) {
-            return fieldType
-                    .cast(createAbstractTextField(LegacyTextField.class));
+        if (fieldType.isAssignableFrom(TextField.class)) {
+            return fieldType.cast(createAbstractTextField(TextField.class));
         }
         return null;
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java
index 1254009cfc..07eb9f27c8 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
@@ -25,14 +25,14 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.TransactionalPropertyWrapper;
-import com.vaadin.ui.DefaultFieldFactory;
 import com.vaadin.util.ReflectTools;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.util.TransactionalPropertyWrapper;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.DefaultFieldFactory;
+import com.vaadin.v7.ui.Field;
 
 /**
  * FieldGroup provides an easy way of binding fields to data and handling
@@ -59,8 +59,8 @@ public class FieldGroup implements Serializable {
     private boolean enabled = true;
     private boolean readOnly = false;
 
-    private HashMap<Object, LegacyField<?>> propertyIdToField = new HashMap<Object, LegacyField<?>>();
-    private LinkedHashMap<LegacyField<?>, Object> fieldToPropertyId = new LinkedHashMap<LegacyField<?>, Object>();
+    private HashMap<Object, Field<?>> propertyIdToField = new HashMap<Object, Field<?>>();
+    private LinkedHashMap<Field<?>, Object> fieldToPropertyId = new LinkedHashMap<Field<?>, Object>();
     private List<CommitHandler> commitHandlers = new ArrayList<CommitHandler>();
 
     /**
@@ -97,7 +97,7 @@ public class FieldGroup implements Serializable {
     public void setItemDataSource(Item itemDataSource) {
         this.itemDataSource = itemDataSource;
 
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             bind(f, fieldToPropertyId.get(f));
         }
     }
@@ -122,7 +122,7 @@ public class FieldGroup implements Serializable {
      *
      * @see #setBuffered(boolean) for more details on buffered mode
      *
-     * @see LegacyField#isBuffered()
+     * @see Field#isBuffered()
      * @return true if buffered mode is on, false otherwise
      *
      */
@@ -141,7 +141,7 @@ public class FieldGroup implements Serializable {
      * The default is to use buffered mode.
      * </p>
      *
-     * @see LegacyField#setBuffered(boolean)
+     * @see Field#setBuffered(boolean)
      * @param buffered
      *            true to turn on buffered mode, false otherwise
      */
@@ -151,7 +151,7 @@ public class FieldGroup implements Serializable {
         }
 
         this.buffered = buffered;
-        for (LegacyField<?> field : getFields()) {
+        for (Field<?> field : getFields()) {
             field.setBuffered(buffered);
         }
     }
@@ -177,7 +177,7 @@ public class FieldGroup implements Serializable {
      */
     public void setEnabled(boolean fieldsEnabled) {
         enabled = fieldsEnabled;
-        for (LegacyField<?> field : getFields()) {
+        for (Field<?> field : getFields()) {
             field.setEnabled(fieldsEnabled);
         }
     }
@@ -207,7 +207,7 @@ public class FieldGroup implements Serializable {
      */
     public void setReadOnly(boolean fieldsReadOnly) {
         readOnly = fieldsReadOnly;
-        for (LegacyField<?> field : getFields()) {
+        for (Field<?> field : getFields()) {
             if (field.getPropertyDataSource() == null
                     || !field.getPropertyDataSource().isReadOnly()) {
                 field.setReadOnly(fieldsReadOnly);
@@ -225,7 +225,7 @@ public class FieldGroup implements Serializable {
      *
      * @return A collection with all bound Fields
      */
-    public Collection<LegacyField<?>> getFields() {
+    public Collection<Field<?>> getFields() {
         return fieldToPropertyId.keySet();
     }
 
@@ -245,7 +245,7 @@ public class FieldGroup implements Serializable {
      *             If the field is null or the property id is already bound to
      *             another field by this field binder
      */
-    public void bind(LegacyField<?> field, Object propertyId)
+    public void bind(Field<?> field, Object propertyId)
             throws BindException {
         throwIfFieldIsNull(field, propertyId);
         throwIfPropertyIdAlreadyBound(field, propertyId);
@@ -285,7 +285,7 @@ public class FieldGroup implements Serializable {
         return new TransactionalPropertyWrapper<T>(itemProperty);
     }
 
-    private void throwIfFieldIsNull(LegacyField<?> field, Object propertyId) {
+    private void throwIfFieldIsNull(Field<?> field, Object propertyId) {
         if (field == null) {
             throw new BindException(String.format(
                     "Cannot bind property id '%s' to a null field.",
@@ -293,7 +293,7 @@ public class FieldGroup implements Serializable {
         }
     }
 
-    private void throwIfPropertyIdAlreadyBound(LegacyField<?> field,
+    private void throwIfPropertyIdAlreadyBound(Field<?> field,
             Object propertyId) {
         if (propertyIdToField.containsKey(propertyId)
                 && propertyIdToField.get(propertyId) != field) {
@@ -340,7 +340,7 @@ public class FieldGroup implements Serializable {
      *             If the field is not bound by this field binder or not bound
      *             to the correct property id
      */
-    public void unbind(LegacyField<?> field) throws BindException {
+    public void unbind(Field<?> field) throws BindException {
         Object propertyId = fieldToPropertyId.get(field);
         if (propertyId == null) {
             throw new BindException(
@@ -376,7 +376,7 @@ public class FieldGroup implements Serializable {
      * @param field
      *            The field to update
      */
-    protected void configureField(LegacyField<?> field) {
+    protected void configureField(Field<?> field) {
         field.setBuffered(isBuffered());
 
         field.setEnabled(isEnabled());
@@ -472,7 +472,7 @@ public class FieldGroup implements Serializable {
         try {
             firePreCommitEvent();
 
-            Map<LegacyField<?>, InvalidValueException> invalidValueExceptions = commitFields();
+            Map<Field<?>, InvalidValueException> invalidValueExceptions = commitFields();
 
             if (invalidValueExceptions.isEmpty()) {
                 firePostCommitEvent();
@@ -495,10 +495,10 @@ public class FieldGroup implements Serializable {
      * @return a propertyId to validation exception map which is empty if all
      *         commits succeeded
      */
-    private Map<LegacyField<?>, InvalidValueException> commitFields() {
-        Map<LegacyField<?>, InvalidValueException> invalidValueExceptions = new HashMap<LegacyField<?>, InvalidValueException>();
+    private Map<Field<?>, InvalidValueException> commitFields() {
+        Map<Field<?>, InvalidValueException> invalidValueExceptions = new HashMap<Field<?>, InvalidValueException>();
 
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             try {
                 f.commit();
             } catch (InvalidValueException e) {
@@ -517,7 +517,7 @@ public class FieldGroup implements Serializable {
      */
     public static class FieldGroupInvalidValueException
             extends InvalidValueException {
-        private Map<LegacyField<?>, InvalidValueException> invalidValueExceptions;
+        private Map<Field<?>, InvalidValueException> invalidValueExceptions;
 
         /**
          * Constructs a new exception with the specified validation exceptions.
@@ -526,7 +526,7 @@ public class FieldGroup implements Serializable {
          *            a property id to exception map
          */
         public FieldGroupInvalidValueException(
-                Map<LegacyField<?>, InvalidValueException> invalidValueExceptions) {
+                Map<Field<?>, InvalidValueException> invalidValueExceptions) {
             super(null, invalidValueExceptions.values().toArray(
                     new InvalidValueException[invalidValueExceptions.size()]));
             this.invalidValueExceptions = invalidValueExceptions;
@@ -538,13 +538,13 @@ public class FieldGroup implements Serializable {
          *
          * @return a map with all the invalid value exceptions
          */
-        public Map<LegacyField<?>, InvalidValueException> getInvalidFields() {
+        public Map<Field<?>, InvalidValueException> getInvalidFields() {
             return invalidValueExceptions;
         }
     }
 
     private void startTransactions() throws CommitException {
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             Property.Transactional<?> property = (Property.Transactional<?>) f
                     .getPropertyDataSource();
             if (property == null) {
@@ -557,13 +557,13 @@ public class FieldGroup implements Serializable {
     }
 
     private void commitTransactions() {
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             ((Property.Transactional<?>) f.getPropertyDataSource()).commit();
         }
     }
 
     private void rollbackTransactions() {
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             try {
                 ((Property.Transactional<?>) f.getPropertyDataSource())
                         .rollback();
@@ -610,7 +610,7 @@ public class FieldGroup implements Serializable {
      *
      */
     public void discard() {
-        for (LegacyField<?> f : fieldToPropertyId.keySet()) {
+        for (Field<?> f : fieldToPropertyId.keySet()) {
             try {
                 f.discard();
             } catch (Exception e) {
@@ -629,7 +629,7 @@ public class FieldGroup implements Serializable {
      * @return The field that is bound to the property id or null if no field is
      *         bound to that property id
      */
-    public LegacyField<?> getField(Object propertyId) {
+    public Field<?> getField(Object propertyId) {
         return propertyIdToField.get(propertyId);
     }
 
@@ -641,7 +641,7 @@ public class FieldGroup implements Serializable {
      * @return The property id that is bound to the field or null if the field
      *         is not bound to any property id by this FieldBinder
      */
-    public Object getPropertyId(LegacyField<?> field) {
+    public Object getPropertyId(Field<?> field) {
         return fieldToPropertyId.get(field);
     }
 
@@ -745,14 +745,14 @@ public class FieldGroup implements Serializable {
     /**
      * Checks the validity of the bound fields.
      * <p>
-     * Call the {@link LegacyField#validate()} for the fields to get the
+     * Call the {@link Field#validate()} for the fields to get the
      * individual error messages.
      *
      * @return true if all bound fields are valid, false otherwise.
      */
     public boolean isValid() {
         try {
-            for (LegacyField<?> field : getFields()) {
+            for (Field<?> field : getFields()) {
                 field.validate();
             }
             return true;
@@ -767,7 +767,7 @@ public class FieldGroup implements Serializable {
      * @return true if at least one field has been modified, false otherwise
      */
     public boolean isModified() {
-        for (LegacyField<?> field : getFields()) {
+        for (Field<?> field : getFields()) {
             if (field.isModified()) {
                 return true;
             }
@@ -801,7 +801,7 @@ public class FieldGroup implements Serializable {
      * Binds member fields found in the given object.
      * <p>
      * This method processes all (Java) member fields whose type extends
-     * {@link LegacyField} and that can be mapped to a property id. Property id
+     * {@link Field} and that can be mapped to a property id. Property id
      * mapping is done based on the field name or on a @{@link PropertyId}
      * annotation on the field. All non-null fields for which a property id can
      * be determined are bound to the property id.
@@ -841,7 +841,7 @@ public class FieldGroup implements Serializable {
      * that have not been initialized.
      * <p>
      * This method processes all (Java) member fields whose type extends
-     * {@link LegacyField} and that can be mapped to a property id. Property ids
+     * {@link Field} and that can be mapped to a property id. Property ids
      * are searched in the following order: @{@link PropertyId} annotations,
      * exact field name matches and the case-insensitive matching that ignores
      * underscores. Fields that are not initialized (null) are built using the
@@ -886,7 +886,7 @@ public class FieldGroup implements Serializable {
      * member fields that have not been initialized.
      * <p>
      * This method processes all (Java) member fields whose type extends
-     * {@link LegacyField} and that can be mapped to a property id. Property ids
+     * {@link Field} and that can be mapped to a property id. Property ids
      * are searched in the following order: @{@link PropertyId} annotations,
      * exact field name matches and the case-insensitive matching that ignores
      * underscores. Fields that are not initialized (null) are built using the
@@ -907,7 +907,7 @@ public class FieldGroup implements Serializable {
         for (java.lang.reflect.Field memberField : getFieldsInDeclareOrder(
                 objectClass)) {
 
-            if (!LegacyField.class.isAssignableFrom(memberField.getType())) {
+            if (!Field.class.isAssignableFrom(memberField.getType())) {
                 // Process next field
                 continue;
             }
@@ -915,7 +915,7 @@ public class FieldGroup implements Serializable {
             PropertyId propertyIdAnnotation = memberField
                     .getAnnotation(PropertyId.class);
 
-            Class<? extends LegacyField> fieldType = (Class<? extends LegacyField>) memberField
+            Class<? extends Field> fieldType = (Class<? extends Field>) memberField
                     .getType();
 
             Object propertyId = null;
@@ -945,11 +945,11 @@ public class FieldGroup implements Serializable {
                 continue;
             }
 
-            LegacyField<?> field;
+            Field<?> field;
             try {
                 // Get the field from the object
-                field = (LegacyField<?>) ReflectTools.getJavaFieldValue(
-                        objectWithMemberFields, memberField, LegacyField.class);
+                field = (Field<?>) ReflectTools.getJavaFieldValue(
+                        objectWithMemberFields, memberField, Field.class);
             } catch (Exception e) {
                 // If we cannot determine the value, just skip the field and try
                 // the next one
@@ -1082,12 +1082,12 @@ public class FieldGroup implements Serializable {
          * @return a map with all the invalid value exceptions. Can be empty but
          *         not null
          */
-        public Map<LegacyField<?>, InvalidValueException> getInvalidFields() {
+        public Map<Field<?>, InvalidValueException> getInvalidFields() {
             if (getCause() instanceof FieldGroupInvalidValueException) {
                 return ((FieldGroupInvalidValueException) getCause())
                         .getInvalidFields();
             }
-            return new HashMap<LegacyField<?>, InvalidValueException>();
+            return new HashMap<Field<?>, InvalidValueException>();
         }
 
         /**
@@ -1137,7 +1137,7 @@ public class FieldGroup implements Serializable {
      *             If there is a problem while building or binding
      * @return The created and bound field
      */
-    public LegacyField<?> buildAndBind(Object propertyId) throws BindException {
+    public Field<?> buildAndBind(Object propertyId) throws BindException {
         String caption = DefaultFieldFactory
                 .createCaptionByPropertyId(propertyId);
         return buildAndBind(caption, propertyId);
@@ -1155,11 +1155,11 @@ public class FieldGroup implements Serializable {
      * @throws BindException
      *             If there is a problem while building or binding
      * @return The created and bound field. Can be any type of
-     *         {@link LegacyField}.
+     *         {@link Field}.
      */
-    public LegacyField<?> buildAndBind(String caption, Object propertyId)
+    public Field<?> buildAndBind(String caption, Object propertyId)
             throws BindException {
-        return buildAndBind(caption, propertyId, LegacyField.class);
+        return buildAndBind(caption, propertyId, Field.class);
     }
 
     /**
@@ -1174,10 +1174,10 @@ public class FieldGroup implements Serializable {
      * @throws BindException
      *             If the field could not be created
      * @return The created and bound field. Can be any type of
-     *         {@link LegacyField}.
+     *         {@link Field}.
      */
 
-    public <T extends LegacyField> T buildAndBind(String caption,
+    public <T extends Field> T buildAndBind(String caption,
             Object propertyId, Class<T> fieldType) throws BindException {
         Class<?> type = getPropertyType(propertyId);
 
@@ -1191,7 +1191,7 @@ public class FieldGroup implements Serializable {
      * Creates a field based on the given data type.
      * <p>
      * The data type is the type that we want to edit using the field. The field
-     * type is the type of field we want to create, can be {@link LegacyField}
+     * type is the type of field we want to create, can be {@link Field}
      * if any LegacyField is good.
      * </p>
      *
@@ -1205,7 +1205,7 @@ public class FieldGroup implements Serializable {
      * @throws BindException
      *             If the field could not be created
      */
-    protected <T extends LegacyField> T build(String caption, Class<?> dataType,
+    protected <T extends Field> T build(String caption, Class<?> dataType,
             Class<T> fieldType) throws BindException {
         T field = getFieldFactory().createField(dataType, fieldType);
         if (field == null) {
@@ -1247,9 +1247,9 @@ public class FieldGroup implements Serializable {
      * @since 7.4
      */
     public void clear() {
-        for (LegacyField<?> f : getFields()) {
-            if (f instanceof LegacyAbstractField) {
-                ((LegacyAbstractField) f).clear();
+        for (Field<?> f : getFields()) {
+            if (f instanceof AbstractField) {
+                ((AbstractField) f).clear();
             }
         }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroupFieldFactory.java
index a80d51c6df..275f96761a 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroupFieldFactory.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.io.Serializable;
 
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.Field;
 
 /**
  * Factory interface for creating new LegacyField-instances based on the data
@@ -34,10 +34,10 @@ public interface FieldGroupFieldFactory extends Serializable {
      *            The type that we want to edit using the field
      * @param fieldType
      *            The type of field we want to create. If set to
-     *            {@link LegacyField} then any type of field is accepted
+     *            {@link Field} then any type of field is accepted
      * @return A field that can be assigned to the given fieldType and that is
      *         capable of editing the given type of data
      */
-    <T extends LegacyField> T createField(Class<?> dataType,
+    <T extends Field> T createField(Class<?> dataType,
             Class<T> fieldType);
 }
diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/PropertyId.java
index 6476635829..09426bc811 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/PropertyId.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.fieldgroup;
+package com.vaadin.v7.data.fieldgroup;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.Field;
 
 /**
- * Defines the custom property name to be bound to a {@link LegacyField} using
+ * Defines the custom property name to be bound to a {@link Field} using
  * {@link FieldGroup} or {@link BeanFieldGroup}.
  * <p>
  * The automatic data binding in FieldGroup and BeanFieldGroup relies on a
  * naming convention by default: properties of an item are bound to similarly
  * named field components in given a editor object. If you want to map a
  * property with a different name (ID) to a
- * {@link com.vaadin.client.ui.LegacyField}, you can use this annotation for the
+ * {@link com.vaadin.client.ui.Field}, you can use this annotation for the
  * member fields, with the name (ID) of the desired property as the parameter.
  * <p>
  * In following usage example, the text field would be bound to property "foo"
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java
index 995e2f8675..4b004d95fa 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -23,19 +23,19 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Filterable;
-import com.vaadin.data.Container.PropertySetChangeNotifier;
-import com.vaadin.data.Container.SimpleFilterable;
-import com.vaadin.data.Container.Sortable;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.Property.ValueChangeNotifier;
-import com.vaadin.data.util.MethodProperty.MethodException;
-import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Filterable;
+import com.vaadin.v7.data.Container.PropertySetChangeNotifier;
+import com.vaadin.v7.data.Container.SimpleFilterable;
+import com.vaadin.v7.data.Container.Sortable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.Property.ValueChangeNotifier;
+import com.vaadin.v7.data.util.MethodProperty.MethodException;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 /**
  * An abstract base class for in-memory containers for JavaBeans.
@@ -524,7 +524,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
      * added at the very end of the unfiltered container and not after the last
      * visible item if filtering is used.
      *
-     * @see com.vaadin.data.Container#addItem(Object)
+     * @see com.com.vaadin.v7.data.Container#addItem(Object)
      */
     protected BeanItem<BEANTYPE> addItem(IDTYPE itemId, BEANTYPE bean) {
         if (!validateBean(bean)) {
@@ -536,7 +536,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
     /**
      * Adds the bean after the given bean.
      *
-     * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object)
+     * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, Object)
      */
     protected BeanItem<BEANTYPE> addItemAfter(IDTYPE previousItemId,
             IDTYPE newItemId, BEANTYPE bean) {
@@ -795,7 +795,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE>
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
     @Override
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java
index 1995102345..f57da653a5 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.EventObject;
 import java.util.LinkedList;
 
-import com.vaadin.data.Container;
+import com.vaadin.v7.data.Container;
 
 /**
  * Abstract container class that manages event listeners and sending events to
@@ -98,7 +98,7 @@ public abstract class AbstractContainer implements Container {
      * {@link PropertySetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener)
+     * @see PropertySetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)
      */
     protected void addPropertySetChangeListener(
             Container.PropertySetChangeListener listener) {
@@ -111,7 +111,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #addPropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
     protected void addListener(Container.PropertySetChangeListener listener) {
@@ -123,7 +123,7 @@ public abstract class AbstractContainer implements Container {
      * {@link PropertySetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.
+     * @see PropertySetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.
      *      PropertySetChangeListener)
      */
     protected void removePropertySetChangeListener(
@@ -135,7 +135,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
     protected void removeListener(
@@ -150,7 +150,7 @@ public abstract class AbstractContainer implements Container {
      * {@link ItemSetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener)
+     * @see ItemSetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)
      */
     protected void addItemSetChangeListener(
             Container.ItemSetChangeListener listener) {
@@ -163,7 +163,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
     protected void addListener(Container.ItemSetChangeListener listener) {
@@ -175,7 +175,7 @@ public abstract class AbstractContainer implements Container {
      * {@link ItemSetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      *
-     * @see ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener)
+     * @see ItemSetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)
      */
     protected void removeItemSetChangeListener(
             Container.ItemSetChangeListener listener) {
@@ -186,7 +186,7 @@ public abstract class AbstractContainer implements Container {
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
     protected void removeListener(Container.ItemSetChangeListener listener) {
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java
index 43b65ab75e..78c908f78a 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -25,11 +25,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.ItemSetChangeNotifier;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.ItemSetChangeNotifier;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 /**
  * Abstract {@link Container} class that handles common functionality for
@@ -67,18 +67,18 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * <code>sort(Object[], boolean[])</code>.
  *
  * To implement {@link Filterable}, subclasses need to implement the methods
- * {@link Filterable#addContainerFilter(com.vaadin.data.Container.Filter)}
+ * {@link Filterable#addContainerFilter(com.com.vaadin.v7.data.Container.Filter)}
  * (calling {@link #addFilter(Filter)}),
  * {@link Filterable#removeAllContainerFilters()} (calling
  * {@link #removeAllFilters()}) and
- * {@link Filterable#removeContainerFilter(com.vaadin.data.Container.Filter)}
- * (calling {@link #removeFilter(com.vaadin.data.Container.Filter)}).
+ * {@link Filterable#removeContainerFilter(com.com.vaadin.v7.data.Container.Filter)}
+ * (calling {@link #removeFilter(com.com.vaadin.v7.data.Container.Filter)}).
  *
  * To implement {@link SimpleFilterable}, subclasses also need to implement the
  * methods
  * {@link SimpleFilterable#addContainerFilter(Object, String, boolean, boolean)}
  * and {@link SimpleFilterable#removeContainerFilters(Object)} calling
- * {@link #addFilter(com.vaadin.data.Container.Filter)} and
+ * {@link #addFilter(com.com.vaadin.v7.data.Container.Filter)} and
  * {@link #removeFilters(Object)} respectively.
  *
  * @param <ITEMIDTYPE>
@@ -444,7 +444,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     // ItemSetChangeNotifier
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
     @Override
@@ -466,7 +466,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #removeItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Deprecated
     @Override
@@ -566,7 +566,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * be in-memory filterable.
      *
      * This can be used to implement
-     * {@link Filterable#addContainerFilter(com.vaadin.data.Container.Filter)}
+     * {@link Filterable#addContainerFilter(com.com.vaadin.v7.data.Container.Filter)}
      * and optionally also
      * {@link SimpleFilterable#addContainerFilter(Object, String, boolean, boolean)}
      * (with {@link SimpleStringFilter}).
@@ -606,7 +606,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Remove a specific container filter and re-filter the view (if necessary).
      *
      * This can be used to implement
-     * {@link Filterable#removeContainerFilter(com.vaadin.data.Container.Filter)}
+     * {@link Filterable#removeContainerFilter(com.com.vaadin.v7.data.Container.Filter)}
      * .
      */
     protected void removeFilter(Filter filter) {
@@ -718,7 +718,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Subclasses should call this from a public
      * {@link #sort(Object[], boolean[])} method when implementing Sortable.
      *
-     * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
+     * @see com.com.vaadin.v7.data.Container.Sortable#sort(java.lang.Object[],
      *      boolean[])
      */
     protected void sortContainer(Object[] propertyId, boolean[] ascending) {
@@ -1142,7 +1142,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * Set the internal collection of filters without performing filtering.
      *
      * This method is mostly for internal use, use
-     * {@link #addFilter(com.vaadin.data.Container.Filter)} and
+     * {@link #addFilter(com.com.vaadin.v7.data.Container.Filter)} and
      * <code>remove*Filter*</code> (which also re-filter the container) instead
      * when possible.
      *
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/BeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java
index 01a5256199..0127adbfee 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/BeanContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.Collection;
 
@@ -40,7 +40,7 @@ import java.util.Collection;
  *
  * <p>
  * If a bean id resolver is set using
- * {@link #setBeanIdResolver(com.vaadin.data.util.AbstractBeanContainer.BeanIdResolver)}
+ * {@link #setBeanIdResolver(com.vaadin.v7.data.util.AbstractBeanContainer.BeanIdResolver)}
  * or {@link #setBeanIdProperty(Object)}, the methods {@link #addBean(Object)},
  * {@link #addBeanAfter(Object, Object)}, {@link #addBeanAt(int, Object)} and
  * {@link #addAll(java.util.Collection)} can be used to add items to the
@@ -78,7 +78,7 @@ public class BeanContainer<IDTYPE, BEANTYPE>
     /**
      * Adds the bean to the Container.
      *
-     * @see com.vaadin.data.Container#addItem(Object)
+     * @see com.com.vaadin.v7.data.Container#addItem(Object)
      */
     @Override
     public BeanItem<BEANTYPE> addItem(IDTYPE itemId, BEANTYPE bean) {
@@ -92,7 +92,7 @@ public class BeanContainer<IDTYPE, BEANTYPE>
     /**
      * Adds the bean after the given item id.
      *
-     * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object)
+     * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, Object)
      */
     @Override
     public BeanItem<BEANTYPE> addItemAfter(IDTYPE previousItemId,
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java
index 2725606a4d..78ec807fd1 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItem.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.vaadin.data.util.BeanUtil;
+
 /**
  * A wrapper class for adding the Item interface to any Java Bean.
  *
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java
index 66e553164d..1e75901b04 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItemContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.Collection;
 
@@ -186,7 +186,7 @@ public class BeanItemContainer<BEANTYPE>
      * @param newItemId
      *            the bean (of type BT) to add (not null)
      *
-     * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object)
+     * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, Object)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -219,7 +219,7 @@ public class BeanItemContainer<BEANTYPE>
      *
      * The bean is used both as the item contents and as the item identifier.
      *
-     * @see com.vaadin.data.Container#addItem(Object)
+     * @see com.com.vaadin.v7.data.Container#addItem(Object)
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -232,7 +232,7 @@ public class BeanItemContainer<BEANTYPE>
      *
      * The bean is used both as the item contents and as the item identifier.
      *
-     * @see com.vaadin.data.Container#addItem(Object)
+     * @see com.com.vaadin.v7.data.Container#addItem(Object)
      */
     @Override
     public BeanItem<BEANTYPE> addBean(BEANTYPE bean) {
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java
index 9e108cd615..308a1e9fd2 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -27,14 +27,14 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 
 /**
  * <p>
  * A wrapper class for adding external hierarchy to containers not implementing
- * the {@link com.vaadin.data.Container.Hierarchical} interface.
+ * the {@link com.vaadin.v7.data.Container.Hierarchical} interface.
  * </p>
  *
  * <p>
@@ -356,7 +356,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * this method fails and <code>false</code> is returned; the children must
      * be first explicitly removed with
      * {@link #setParent(Object itemId, Object newParentId)} or
-     * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
+     * {@link com.vaadin.v7.data.Container#removeItem(Object itemId)}.
      * </p>
      *
      * @param itemId
@@ -736,7 +736,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -761,7 +761,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #removeItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -786,7 +786,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #addPropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -811,7 +811,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Override
     @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/FilesystemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java
index 46b4f4bcd4..7800a6ff50 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/FilesystemContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -30,11 +30,11 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
 import com.vaadin.server.Resource;
 import com.vaadin.util.FileTypeResolver;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 
 /**
  * A hierarchical container wrapper for a filesystem.
@@ -739,7 +739,7 @@ public class FilesystemContainer implements Container.Hierarchical {
         /**
          * Filesystem container does not support adding new properties.
          *
-         * @see com.vaadin.data.Item#addItemProperty(Object, Property)
+         * @see com.vaadin.v7.data.Item#addItemProperty(Object, Property)
          */
         @Override
         public boolean addItemProperty(Object id, Property property)
@@ -751,7 +751,7 @@ public class FilesystemContainer implements Container.Hierarchical {
         /**
          * Filesystem container does not support removing properties.
          *
-         * @see com.vaadin.data.Item#removeItemProperty(Object)
+         * @see com.vaadin.v7.data.Item#removeItemProperty(Object)
          */
         @Override
         public boolean removeItemProperty(Object id)
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java
index 8d7a1512f9..cfa061db02 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -27,12 +27,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
 import com.vaadin.data.sort.SortOrder;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
 import com.vaadin.shared.data.sort.SortDirection;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 /**
  * Container wrapper that adds support for generated properties. This container
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java
index 115fd91791..04940918de 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -26,8 +26,8 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
 
 /**
  * A specialized Container whose contents can be accessed like it was a
@@ -194,7 +194,7 @@ public class HierarchicalContainer extends IndexedContainer
      * this method fails and <code>false</code> is returned; the children must
      * be first explicitly removed with
      * {@link #setParent(Object itemId, Object newParentId)} or
-     * {@link com.vaadin.data.Container#removeItem(Object itemId)}.
+     * {@link com.vaadin.v7.data.Container#removeItem(Object itemId)}.
      * </p>
      *
      * @param itemId
@@ -431,7 +431,7 @@ public class HierarchicalContainer extends IndexedContainer
 
     @Override
     protected void fireItemSetChange(
-            com.vaadin.data.Container.ItemSetChangeEvent event) {
+            com.vaadin.v7.data.Container.ItemSetChangeEvent event) {
         if (contentsChangeEventsOn()) {
             super.fireItemSetChange(event);
         } else {
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/IndexedContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java
index 4ff253394a..cbec3a2327 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/IndexedContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.data.util;
+package com.vaadin.v7.data.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -29,11 +29,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 /**
  * An implementation of the <code>{@link Container.Indexed}</code> interface
@@ -50,7 +50,7 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * <li>Sends all needed events on content changes.
  * </ul>
  *
- * @see com.vaadin.data.Container
+ * @see com.vaadin.v7.data.Container
  *
  * @author Vaadin Ltd.
  * @since 3.0
@@ -503,7 +503,7 @@ public class IndexedContainer
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #addPropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
     @Override
@@ -519,7 +519,7 @@ public class IndexedContainer
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Deprecated
     @Override
@@ -543,7 +543,7 @@ public class IndexedContainer
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     *             {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)}
      **/
     @Override
     @Deprecated
@@ -567,7 +567,7 @@ public class IndexedContainer
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     *             {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)}
      **/
     @Override
     @Deprecated
@@ -818,7 +818,7 @@ public class IndexedContainer
          * properties at container level. See
          * {@link IndexedContainer#addContainerProperty(Object, Class, Object)}
          *
-         * @see com.vaadin.data.Item#addProperty(Object, Property)
+         * @see com.vaadin.v7.data.Item#addProperty(Object, Property)
          */
         @Override
         public boolean addItemProperty(Object id, Property property)
@@ -832,7 +832,7 @@ public class IndexedContainer
          * properties at container level. See
          * {@link IndexedContainer#removeContainerProperty(Object)}
          *
-         * @see com.vaadin.data.Item#removeProperty(Object)
+         * @see com.vaadin.v7.data.Item#removeProperty(Object)
          */
         @Override
         public boolean removeItemProperty(Object id)
@@ -1009,7 +1009,7 @@ public class IndexedContainer
 
         /**
          * @deprecated As of 7.0, replaced by
-         *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+         *             {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)}
          **/
         @Override
         @Deprecated
@@ -1031,7 +1031,7 @@ public class IndexedContainer
 
         /**
          * @deprecated As of 7.0, replaced by
-         *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+         *             {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)}
          **/
         @Override
         @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheFlushNotifier.java
index d3559b5652..fe9af78922 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheFlushNotifier.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.Serializable;
 import java.lang.ref.ReferenceQueue;
@@ -21,9 +21,9 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.data.util.sqlcontainer.query.FreeformQuery;
-import com.vaadin.data.util.sqlcontainer.query.QueryDelegate;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.FreeformQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
 
 /**
  * CacheFlushNotifier is a simple static notification mechanism to inform other
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheMap.java
index 77919f72b2..f986e7db51 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheMap.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java
index e7d83e118d..d437cc9b33 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.logging.Logger;
 
-import com.vaadin.data.Property;
-import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.converter.Converter.ConversionException;
 
 /**
  * ColumnProperty represents the value of one column in a RowItem. In addition
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/OptimisticLockException.java
index 1a29d531bc..887aa9c458 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/OptimisticLockException.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
 
 /**
  * An OptimisticLockException is thrown when trying to update or delete a row
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowId.java
index 367135782f..2a6cca6fc6 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowId.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 public class ReadOnlyRowId extends RowId {
     private static final long serialVersionUID = -2626764781642012467L;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/Reference.java
index ce6680089d..a80b07aca2 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/Reference.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowId.java
index 5f78df79e1..0181dac2b3 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowId.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java
index ffc8bfc6f7..b8039e1e68 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 
 /**
  * RowItem represents one row of a result set obtained from a QueryDelegate.
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java
index dde57d3610..b2d5b91746 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.IOException;
 import java.sql.ResultSet;
@@ -32,19 +32,19 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.ContainerHelpers;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.QueryDelegate;
-import com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
-import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.ContainerHelpers;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.filter.Compare.Equal;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate;
+import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.OracleGenerator;
 
 public class SQLContainer implements Container, Container.Filterable,
         Container.Indexed, Container.Sortable, Container.ItemSetChangeNotifier {
@@ -1592,7 +1592,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -1618,7 +1618,7 @@ public class SQLContainer implements Container, Container.Filterable,
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #removeItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLUtil.java
index 2abe45d5fc..3939f7ab08 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/TemporaryRowId.java
index 5cd3e6fac8..78c3339f05 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/TemporaryRowId.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
 
 public class TemporaryRowId extends RowId {
     private static final long serialVersionUID = -641983830469018329L;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPool.java
index cf50a641de..55ab7f041a 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.connection;
+package com.vaadin.v7.data.util.sqlcontainer.connection;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/JDBCConnectionPool.java
index 842a264caa..fce1d8aa25 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/JDBCConnectionPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.connection;
+package com.vaadin.v7.data.util.sqlcontainer.connection;
 
 import java.io.Serializable;
 import java.sql.Connection;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
index 9cf02a9e68..fb4444a436 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.connection;
+package com.vaadin.v7.data.util.sqlcontainer.connection;
 
 import java.io.IOException;
 import java.sql.Connection;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
index 586fe28171..dc582dd120 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.Serializable;
 import java.sql.Connection;
@@ -22,7 +22,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
 
 /**
  * Common base class for database query classes that handle connections and
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java
index 8066d563a4..53006ce849 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -26,12 +26,12 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 @SuppressWarnings("serial")
 public class FreeformQuery extends AbstractTransactionalQuery
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryDelegate.java
index fac0b1ab45..7af783256f 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryDelegate.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.Serializable;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
 
 public interface FreeformQueryDelegate extends Serializable {
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformStatementDelegate.java
index 884a303684..d658ea7188 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformStatementDelegate.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 /**
  * FreeformStatementDelegate is an extension to FreeformQueryDelegate that
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/OrderBy.java
index ed57967772..c6315f12dc 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/OrderBy.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryDelegate.java
index 16e04a7da0..cc4c9f5668 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryDelegate.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.Serializable;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.RowId;
-import com.vaadin.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.RowId;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
 
 public interface QueryDelegate extends Serializable {
     /**
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java
index 959c494634..a8a84ea086 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query;
+package com.vaadin.v7.data.util.sqlcontainer.query;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -32,19 +32,19 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.sqlcontainer.ColumnProperty;
-import com.vaadin.data.util.sqlcontainer.OptimisticLockException;
-import com.vaadin.data.util.sqlcontainer.RowId;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.SQLUtil;
-import com.vaadin.data.util.sqlcontainer.TemporaryRowId;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Compare.Equal;
+import com.vaadin.v7.data.util.sqlcontainer.ColumnProperty;
+import com.vaadin.v7.data.util.sqlcontainer.OptimisticLockException;
+import com.vaadin.v7.data.util.sqlcontainer.RowId;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.util.sqlcontainer.SQLUtil;
+import com.vaadin.v7.data.util.sqlcontainer.TemporaryRowId;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.SQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 @SuppressWarnings("serial")
 public class TableQuery extends AbstractTransactionalQuery
@@ -835,7 +835,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
+     *             {@link #addRowIdChangeListener(com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
      **/
     @Override
     @Deprecated
@@ -855,7 +855,7 @@ public class TableQuery extends AbstractTransactionalQuery
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
+     *             {@link #removeRowIdChangeListener(com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)}
      **/
     @Override
     @Deprecated
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
index 9c05545e41..5439258f32 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.ColumnProperty;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.SQLUtil;
-import com.vaadin.data.util.sqlcontainer.TemporaryRowId;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.StringDecorator;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.ColumnProperty;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.util.sqlcontainer.SQLUtil;
+import com.vaadin.v7.data.util.sqlcontainer.TemporaryRowId;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.StringDecorator;
 
 /**
  * Generates generic SQL that is supported by HSQLDB, MySQL and PostgreSQL.
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
index baddc60e3f..fd4f0bcfbe 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator;
 
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 @SuppressWarnings("serial")
 public class MSSQLGenerator extends DefaultSQLGenerator {
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/OracleGenerator.java
index 0097b5017c..64a0c22d97 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/OracleGenerator.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator;
 
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
-import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 @SuppressWarnings("serial")
 public class OracleGenerator extends DefaultSQLGenerator {
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/SQLGenerator.java
index 6011346b78..1841c0a23b 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/SQLGenerator.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator;
 
 import java.io.Serializable;
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.RowItem;
-import com.vaadin.data.util.sqlcontainer.query.OrderBy;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.RowItem;
+import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy;
 
 /**
  * The SQLGenerator interface is meant to be implemented for each different SQL
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/StatementHelper.java
index 43cfb597bb..fe8240cd42 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/StatementHelper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
index 6eab9f5596..ef958459fb 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.And;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.And;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class AndTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
index 2cdecd1e6d..7e491925a3 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Between;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Between;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class BetweenTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
index bcb348dc8a..44e5a7ee14 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Compare;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Compare;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class CompareTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
index e593146550..4bd1807600 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
 import java.io.Serializable;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public interface FilterTranslator extends Serializable {
     public boolean translatesFilter(Filter filter);
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
index dd7a90828a..d2dda82232 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.IsNull;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.IsNull;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class IsNullTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
index 3c27240e9e..bd41aa1abf 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class LikeTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
index fe98ca24b6..83110e2f41 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.IsNull;
-import com.vaadin.data.util.filter.Not;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.IsNull;
+import com.vaadin.v7.data.util.filter.Not;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class NotTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
index 2f30acc89f..61fad7b559 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Or;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Or;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class OrTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
index b8fb306076..c7ed3f91ae 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class QueryBuilder implements Serializable {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
index 312adc5ed7..bb47fbd826 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.util.filter.Like;
-import com.vaadin.data.util.filter.SimpleStringFilter;
-import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.util.filter.Like;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper;
 
 public class SimpleStringTranslator implements FilterTranslator {
 
diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
index f8005f4290..72c841fe0a 100644
--- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.data.util.sqlcontainer.query.generator.filter;
+package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractStringValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractStringValidator.java
index c0eb3b5fa3..340b34237d 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractStringValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractStringValidator.java
@@ -28,8 +28,8 @@ package com.vaadin.v7.data.validator;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public abstract class LegacyAbstractStringValidator
-        extends LegacyAbstractValidator<String> {
+public abstract class AbstractStringValidator
+        extends AbstractValidator<String> {
 
     /**
      * Constructs a validator for strings.
@@ -43,7 +43,7 @@ public abstract class LegacyAbstractStringValidator
      *            the message to be included in an {@link InvalidValueException}
      *            (with "{0}" replaced by the value that failed validation).
      */
-    public LegacyAbstractStringValidator(String errorMessage) {
+    public AbstractStringValidator(String errorMessage) {
         super(errorMessage);
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java
index 8c1cc56010..8f900961df 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java
@@ -44,7 +44,7 @@ import com.vaadin.v7.data.Validator;
  * @author Vaadin Ltd.
  * @since 5.4
  */
-public abstract class LegacyAbstractValidator<T> implements Validator {
+public abstract class AbstractValidator<T> implements Validator {
 
     /**
      * Error message that is included in an {@link InvalidValueException} if
@@ -59,7 +59,7 @@ public abstract class LegacyAbstractValidator<T> implements Validator {
      *            the message to be included in an {@link InvalidValueException}
      *            (with "{0}" replaced by the value that failed validation).
      */
-    public LegacyAbstractValidator(String errorMessage) {
+    public AbstractValidator(String errorMessage) {
         this.errorMessage = errorMessage;
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBeanValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BeanValidator.java
index dfc107280f..9afd816ac0 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBeanValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BeanValidator.java
@@ -44,7 +44,7 @@ import com.vaadin.v7.data.Validator;
  * @author Petri Hakala
  * @author Henri Sara
  */
-public class LegacyBeanValidator implements Validator {
+public class BeanValidator implements Validator {
 
     private static final long serialVersionUID = 1L;
     private static ValidatorFactory factory;
@@ -97,7 +97,7 @@ public class LegacyBeanValidator implements Validator {
      * @param propertyName
      *            property to validate
      */
-    public LegacyBeanValidator(Class<?> beanClass, String propertyName) {
+    public BeanValidator(Class<?> beanClass, String propertyName) {
         this.beanClass = beanClass;
         this.propertyName = propertyName;
         locale = Locale.getDefault();
@@ -169,7 +169,7 @@ public class LegacyBeanValidator implements Validator {
     /**
      * Returns a shared Validator instance to use. An instance is created using
      * the validator factory if necessary and thereafter reused by the
-     * {@link LegacyBeanValidator} instance.
+     * {@link BeanValidator} instance.
      *
      * @return the JSR-303 {@link javax.validation.Validator} to use
      */
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigDecimalRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigDecimalRangeValidator.java
index 72c959e773..652e33e12e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigDecimalRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigDecimalRangeValidator.java
@@ -24,8 +24,8 @@ import java.math.BigDecimal;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyBigDecimalRangeValidator
-        extends LegacyRangeValidator<BigDecimal> {
+public class BigDecimalRangeValidator
+        extends RangeValidator<BigDecimal> {
 
     /**
      * Creates a validator for checking that an BigDecimal is within a given
@@ -43,7 +43,7 @@ public class LegacyBigDecimalRangeValidator
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyBigDecimalRangeValidator(String errorMessage,
+    public BigDecimalRangeValidator(String errorMessage,
             BigDecimal minValue, BigDecimal maxValue) {
         super(errorMessage, BigDecimal.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigIntegerRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigIntegerRangeValidator.java
index 363a9bb82c..62ec012344 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigIntegerRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigIntegerRangeValidator.java
@@ -24,8 +24,8 @@ import java.math.BigInteger;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyBigIntegerRangeValidator
-        extends LegacyRangeValidator<BigInteger> {
+public class BigIntegerRangeValidator
+        extends RangeValidator<BigInteger> {
 
     /**
      * Creates a validator for checking that an BigInteger is within a given
@@ -43,7 +43,7 @@ public class LegacyBigIntegerRangeValidator
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyBigIntegerRangeValidator(String errorMessage,
+    public BigIntegerRangeValidator(String errorMessage,
             BigInteger minValue, BigInteger maxValue) {
         super(errorMessage, BigInteger.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyByteRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ByteRangeValidator.java
index 14694c4a52..4bbb1b3290 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyByteRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ByteRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyByteRangeValidator extends LegacyRangeValidator<Byte> {
+public class ByteRangeValidator extends RangeValidator<Byte> {
 
     /**
      * Creates a validator for checking that an Byte is within a given range.
@@ -39,7 +39,7 @@ public class LegacyByteRangeValidator extends LegacyRangeValidator<Byte> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyByteRangeValidator(String errorMessage, Byte minValue,
+    public ByteRangeValidator(String errorMessage, Byte minValue,
             Byte maxValue) {
         super(errorMessage, Byte.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyCompositeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/CompositeValidator.java
index ecf4d121f2..2827c401ed 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyCompositeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/CompositeValidator.java
@@ -34,7 +34,7 @@ import com.vaadin.v7.data.Validator;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class LegacyCompositeValidator implements Validator {
+public class CompositeValidator implements Validator {
 
     public enum CombinationMode {
         /**
@@ -78,7 +78,7 @@ public class LegacyCompositeValidator implements Validator {
      * Construct a composite validator in <code>AND</code> mode without error
      * message.
      */
-    public LegacyCompositeValidator() {
+    public CompositeValidator() {
         this(CombinationMode.AND, "");
     }
 
@@ -88,7 +88,7 @@ public class LegacyCompositeValidator implements Validator {
      * @param mode
      * @param errorMessage
      */
-    public LegacyCompositeValidator(CombinationMode mode, String errorMessage) {
+    public CompositeValidator(CombinationMode mode, String errorMessage) {
         setErrorMessage(errorMessage);
         setMode(mode);
     }
@@ -243,9 +243,9 @@ public class LegacyCompositeValidator implements Validator {
             if (validatorType.isAssignableFrom(v.getClass())) {
                 found.add(v);
             }
-            if (v instanceof LegacyCompositeValidator
-                    && ((LegacyCompositeValidator) v).getMode() == MODE_AND) {
-                final Collection<Validator> c = ((LegacyCompositeValidator) v)
+            if (v instanceof CompositeValidator
+                    && ((CompositeValidator) v).getMode() == MODE_AND) {
+                final Collection<Validator> c = ((CompositeValidator) v)
                         .getSubValidators(validatorType);
                 if (c != null) {
                     found.addAll(c);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDateRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DateRangeValidator.java
index 94cc2f78e7..f46f8d989e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDateRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DateRangeValidator.java
@@ -31,7 +31,7 @@ import com.vaadin.shared.ui.datefield.Resolution;
  * @author Vaadin Ltd.
  * @since 7.0
  */
-public class LegacyDateRangeValidator extends LegacyRangeValidator<Date> {
+public class DateRangeValidator extends RangeValidator<Date> {
 
     /**
      * Creates a validator for checking that an Date is within a given range.
@@ -53,7 +53,7 @@ public class LegacyDateRangeValidator extends LegacyRangeValidator<Date> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyDateRangeValidator(String errorMessage, Date minValue,
+    public DateRangeValidator(String errorMessage, Date minValue,
             Date maxValue, Resolution resolution) {
         super(errorMessage, Date.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleRangeValidator.java
index 7416ad60e6..1a6d8cd208 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 7.0
  */
 @SuppressWarnings("serial")
-public class LegacyDoubleRangeValidator extends LegacyRangeValidator<Double> {
+public class DoubleRangeValidator extends RangeValidator<Double> {
 
     /**
      * Creates a validator for checking that an Double is within a given range.
@@ -39,7 +39,7 @@ public class LegacyDoubleRangeValidator extends LegacyRangeValidator<Double> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyDoubleRangeValidator(String errorMessage, Double minValue,
+    public DoubleRangeValidator(String errorMessage, Double minValue,
             Double maxValue) {
         super(errorMessage, Double.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleValidator.java
index fcc94f6e7c..0d0dd8ff40 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleValidator.java
@@ -15,23 +15,23 @@
  */
 package com.vaadin.v7.data.validator;
 
-import com.vaadin.data.Property;
-import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.converter.StringToDoubleConverter;
 
 /**
  * String validator for a double precision floating point number. See
- * {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} for
+ * {@link com.vaadin.v7.data.validator.AbstractStringValidator} for
  * more information.
  *
  * @author Vaadin Ltd.
  * @since 5.4
- * @deprecated As of 7.0. Use a {@link LegacyStringToDoubleConverter} converter
+ * @deprecated As of 7.0. Use a {@link StringToDoubleConverter} converter
  *             on the field instead or bind the field to a {@link Property} of
  *             type {@link Double}.
  */
 @Deprecated
 @SuppressWarnings("serial")
-public class LegacyDoubleValidator extends LegacyAbstractStringValidator {
+public class DoubleValidator extends AbstractStringValidator {
 
     /**
      * Creates a validator for checking that a string can be parsed as an
@@ -40,11 +40,11 @@ public class LegacyDoubleValidator extends LegacyAbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @deprecated As of 7.0. Use a Double converter on the field instead and/or
-     *             use a {@link LegacyDoubleRangeValidator} for validating that
+     *             use a {@link DoubleRangeValidator} for validating that
      *             the value is inside a given range.
      */
     @Deprecated
-    public LegacyDoubleValidator(String errorMessage) {
+    public DoubleValidator(String errorMessage) {
         super(errorMessage);
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyEmailValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java
index 836ff5ff15..7d87eda52e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyEmailValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java
@@ -20,7 +20,7 @@ package com.vaadin.v7.data.validator;
  * complete according to RFC 822 but handles the vast majority of valid e-mail
  * addresses correctly.
  *
- * See {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator}
+ * See {@link com.vaadin.v7.data.validator.AbstractStringValidator}
  * for more information.
  *
  * <p>
@@ -33,7 +33,7 @@ package com.vaadin.v7.data.validator;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public class LegacyEmailValidator extends LegacyRegexpValidator {
+public class EmailValidator extends RegexpValidator {
 
     /**
      * Creates a validator for checking that a string is a syntactically valid
@@ -42,7 +42,7 @@ public class LegacyEmailValidator extends LegacyRegexpValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public LegacyEmailValidator(String errorMessage) {
+    public EmailValidator(String errorMessage) {
         super("^([a-zA-Z0-9_\\.\\-+])+@(([a-zA-Z0-9-])+\\.)+([a-zA-Z0-9]{2,4})+$",
                 true, errorMessage);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyFloatRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/FloatRangeValidator.java
index 9dc27d3727..c63b4a51a2 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyFloatRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/FloatRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyFloatRangeValidator extends LegacyRangeValidator<Float> {
+public class FloatRangeValidator extends RangeValidator<Float> {
 
     /**
      * Creates a validator for checking that an Float is within a given range.
@@ -39,7 +39,7 @@ public class LegacyFloatRangeValidator extends LegacyRangeValidator<Float> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyFloatRangeValidator(String errorMessage, Float minValue,
+    public FloatRangeValidator(String errorMessage, Float minValue,
             Float maxValue) {
         super(errorMessage, Float.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerRangeValidator.java
index 09de051e1d..48fa420f06 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public class LegacyIntegerRangeValidator extends LegacyRangeValidator<Integer> {
+public class IntegerRangeValidator extends RangeValidator<Integer> {
 
     /**
      * Creates a validator for checking that an Integer is within a given range.
@@ -39,7 +39,7 @@ public class LegacyIntegerRangeValidator extends LegacyRangeValidator<Integer> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyIntegerRangeValidator(String errorMessage, Integer minValue,
+    public IntegerRangeValidator(String errorMessage, Integer minValue,
             Integer maxValue) {
         super(errorMessage, Integer.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerValidator.java
index 34d2e7e76b..b5f671b6f1 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerValidator.java
@@ -15,23 +15,23 @@
  */
 package com.vaadin.v7.data.validator;
 
-import com.vaadin.data.Property;
-import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.converter.StringToIntegerConverter;
 
 /**
  * String validator for integers. See
- * {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} for
+ * {@link com.vaadin.v7.data.validator.AbstractStringValidator} for
  * more information.
  *
  * @author Vaadin Ltd.
  * @since 5.4
- * @deprecated As of 7.0. Use a {@link LegacyStringToIntegerConverter} converter
+ * @deprecated As of 7.0. Use a {@link StringToIntegerConverter} converter
  *             on the field instead or bind the field to a {@link Property} of
  *             type {@link Integer}.
  */
 @SuppressWarnings("serial")
 @Deprecated
-public class LegacyIntegerValidator extends LegacyAbstractStringValidator {
+public class IntegerValidator extends AbstractStringValidator {
 
     /**
      * Creates a validator for checking that a string can be parsed as an
@@ -40,11 +40,11 @@ public class LegacyIntegerValidator extends LegacyAbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      * @deprecated As of 7.0. Use an Integer converter on the field instead
-     *             and/or use an {@link LegacyIntegerRangeValidator} for
+     *             and/or use an {@link IntegerRangeValidator} for
      *             validating that the value is inside a given range.
      */
     @Deprecated
-    public LegacyIntegerValidator(String errorMessage) {
+    public IntegerValidator(String errorMessage) {
         super(errorMessage);
 
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyLongRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LongRangeValidator.java
index 8e5523b46a..440961430c 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyLongRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LongRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyLongRangeValidator extends LegacyRangeValidator<Long> {
+public class LongRangeValidator extends RangeValidator<Long> {
 
     /**
      * Creates a validator for checking that an Long is within a given range.
@@ -39,7 +39,7 @@ public class LegacyLongRangeValidator extends LegacyRangeValidator<Long> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyLongRangeValidator(String errorMessage, Long minValue,
+    public LongRangeValidator(String errorMessage, Long minValue,
             Long maxValue) {
         super(errorMessage, Long.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyNullValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/NullValidator.java
index 282f5baf29..60e1cb4550 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyNullValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/NullValidator.java
@@ -26,7 +26,7 @@ import com.vaadin.v7.data.Validator;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class LegacyNullValidator implements Validator {
+public class NullValidator implements Validator {
 
     private boolean onlyNullAllowed;
 
@@ -40,7 +40,7 @@ public class LegacyNullValidator implements Validator {
      * @param onlyNullAllowed
      *            Are only nulls allowed?
      */
-    public LegacyNullValidator(String errorMessage, boolean onlyNullAllowed) {
+    public NullValidator(String errorMessage, boolean onlyNullAllowed) {
         setErrorMessage(errorMessage);
         setNullAllowed(onlyNullAllowed);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RangeValidator.java
index 27830be7dd..c4749ae2a6 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RangeValidator.java
@@ -21,10 +21,10 @@ package com.vaadin.v7.data.validator;
  *
  * Verifies that the value is of the given type and within the (optionally)
  * given limits. Typically you want to use a sub class of this like
- * {@link LegacyIntegerRangeValidator}, {@link LegacyDoubleRangeValidator} or
- * {@link LegacyDateRangeValidator} in applications.
+ * {@link IntegerRangeValidator}, {@link DoubleRangeValidator} or
+ * {@link DateRangeValidator} in applications.
  * <p>
- * Note that {@link LegacyRangeValidator} always accept null values. Make a
+ * Note that {@link RangeValidator} always accept null values. Make a
  * field required to ensure that no empty values are accepted or override
  * {@link #isValidValue(Comparable)}.
  * </p>
@@ -35,8 +35,8 @@ package com.vaadin.v7.data.validator;
  * @author Vaadin Ltd.
  * @since 7.0
  */
-public class LegacyRangeValidator<T extends Comparable>
-        extends LegacyAbstractValidator<T> {
+public class RangeValidator<T extends Comparable>
+        extends AbstractValidator<T> {
 
     private T minValue = null;
     private boolean minValueIncluded = true;
@@ -56,7 +56,7 @@ public class LegacyRangeValidator<T extends Comparable>
      * @param maxValue
      *            The maximum value that should be accepted or null for no limit
      */
-    public LegacyRangeValidator(String errorMessage, Class<T> type, T minValue,
+    public RangeValidator(String errorMessage, Class<T> type, T minValue,
             T maxValue) {
         super(errorMessage);
         this.type = type;
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRegexpValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RegexpValidator.java
index 0649dd2f13..a9af0d0167 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRegexpValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RegexpValidator.java
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
  * {@link java.util.regex.Pattern#sum}
  * </p>
  * <p>
- * See {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator}
+ * See {@link com.vaadin.v7.data.validator.AbstractStringValidator}
  * for more information.
  * </p>
  * <p>
@@ -40,7 +40,7 @@ import java.util.regex.Pattern;
  * @since 5.4
  */
 @SuppressWarnings("serial")
-public class LegacyRegexpValidator extends LegacyAbstractStringValidator {
+public class RegexpValidator extends AbstractStringValidator {
 
     private Pattern pattern;
     private boolean complete;
@@ -55,7 +55,7 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public LegacyRegexpValidator(String regexp, String errorMessage) {
+    public RegexpValidator(String regexp, String errorMessage) {
         this(regexp, true, errorMessage);
     }
 
@@ -71,7 +71,7 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public LegacyRegexpValidator(String regexp, boolean complete,
+    public RegexpValidator(String regexp, boolean complete,
             String errorMessage) {
         super(errorMessage);
         pattern = Pattern.compile(regexp);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyShortRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ShortRangeValidator.java
index e23575e4d9..2bf89cbca8 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyShortRangeValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ShortRangeValidator.java
@@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator;
  * @since 7.4
  */
 @SuppressWarnings("serial")
-public class LegacyShortRangeValidator extends LegacyRangeValidator<Short> {
+public class ShortRangeValidator extends RangeValidator<Short> {
 
     /**
      * Creates a validator for checking that an Short is within a given range.
@@ -39,7 +39,7 @@ public class LegacyShortRangeValidator extends LegacyRangeValidator<Short> {
      * @param maxValue
      *            The maximum value to accept or null for no limit
      */
-    public LegacyShortRangeValidator(String errorMessage, Short minValue,
+    public ShortRangeValidator(String errorMessage, Short minValue,
             Short maxValue) {
         super(errorMessage, Short.class, minValue, maxValue);
     }
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyStringLengthValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/StringLengthValidator.java
index 4bf7d430ba..dc863ab31a 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyStringLengthValidator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/StringLengthValidator.java
@@ -24,7 +24,7 @@ package com.vaadin.v7.data.validator;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
+public class StringLengthValidator extends AbstractStringValidator {
 
     private Integer minLength = null;
 
@@ -38,7 +38,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
      * @param errorMessage
      *            the message to display in case the value does not validate.
      */
-    public LegacyStringLengthValidator(String errorMessage) {
+    public StringLengthValidator(String errorMessage) {
         super(errorMessage);
     }
 
@@ -60,7 +60,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator {
      *            Are null strings permissible? This can be handled better by
      *            setting a field as required or not.
      */
-    public LegacyStringLengthValidator(String errorMessage, Integer minLength,
+    public StringLengthValidator(String errorMessage, Integer minLength,
             Integer maxLength, boolean allowNull) {
         this(errorMessage);
         setMinLength(minLength);
diff --git a/compatibility-server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/DataGenerator.java
index f7459a7dd3..ee71b587f9 100644
--- a/compatibility-server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/DataGenerator.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.server.communication.data;
+package com.vaadin.v7.server.communication.data;
 
 import java.io.Serializable;
 
-import com.vaadin.data.Item;
-import com.vaadin.ui.LegacyGrid.AbstractGridExtension;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Grid.AbstractGridExtension;
 
 import elemental.json.JsonObject;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java
index 341c3f1a45..dce3eb1cfa 100644
--- a/compatibility-server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.server.communication.data;
+package com.vaadin.v7.server.communication.data;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -26,18 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.Container.Indexed.ItemAddEvent;
-import com.vaadin.data.Container.Indexed.ItemRemoveEvent;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Container.ItemSetChangeNotifier;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.Property.ValueChangeNotifier;
 import com.vaadin.server.AbstractExtension;
 import com.vaadin.server.ClientConnector;
 import com.vaadin.server.KeyMapper;
@@ -45,8 +33,20 @@ import com.vaadin.shared.data.DataProviderRpc;
 import com.vaadin.shared.data.DataRequestRpc;
 import com.vaadin.shared.ui.grid.GridState;
 import com.vaadin.shared.ui.grid.Range;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.Container.Indexed.ItemAddEvent;
+import com.vaadin.v7.data.Container.Indexed.ItemRemoveEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Container.ItemSetChangeNotifier;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.Property.ValueChangeNotifier;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
 
 import elemental.json.Json;
 import elemental.json.JsonArray;
@@ -151,7 +151,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
 
     /**
      * A class to listen to changes in property values in the Container added
-     * with {@link LegacyGrid#setContainerDatasource(Container.Indexed)}, and notifies
+     * with {@link Grid#setContainerDatasource(Container.Indexed)}, and notifies
      * the data source to update the client-side representation of the modified
      * item.
      * <p>
@@ -164,8 +164,8 @@ public class RpcDataProviderExtension extends AbstractExtension {
      * value changes, an instance of this class needs to be attached to each and
      * every Item's Property in the container.
      *
-     * @see LegacyGrid#addValueChangeListener(Container, Object, Object)
-     * @see LegacyGrid#valueChangeListeners
+     * @see Grid#addValueChangeListener(Container, Object, Object)
+     * @see Grid#valueChangeListeners
      */
     private class GridValueChangeListener implements ValueChangeListener {
         private final Object itemId;
@@ -408,14 +408,14 @@ public class RpcDataProviderExtension extends AbstractExtension {
     }
 
     /**
-     * Makes the data source available to the given {@link LegacyGrid} component.
+     * Makes the data source available to the given {@link Grid} component.
      *
      * @param component
      *            the remote data grid component to extend
      * @param columnKeys
      *            the key mapper for columns
      */
-    public void extend(LegacyGrid component) {
+    public void extend(Grid component) {
         super.extend(component);
     }
 
@@ -568,7 +568,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
                         .removeItemSetChangeListener(itemListener);
             }
 
-        } else if (!(parent instanceof LegacyGrid)) {
+        } else if (!(parent instanceof Grid)) {
             throw new IllegalStateException(
                     "Grid is the only accepted parent type");
         }
@@ -626,7 +626,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
         return activeItemHandler.keyMapper;
     }
 
-    protected LegacyGrid getGrid() {
-        return (LegacyGrid) getParent();
+    protected Grid getGrid() {
+        return (Grid) getParent();
     }
 }
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/AbstractColorPicker.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java
index d7d12c6d03..da03136593 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -25,14 +25,16 @@ import org.jsoup.nodes.Element;
 import com.vaadin.shared.ui.colorpicker.Color;
 import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc;
 import com.vaadin.shared.ui.colorpicker.ColorPickerState;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.UI;
 import com.vaadin.ui.Window.CloseEvent;
 import com.vaadin.ui.Window.CloseListener;
-import com.vaadin.ui.components.colorpicker.ColorChangeEvent;
-import com.vaadin.ui.components.colorpicker.ColorChangeListener;
-import com.vaadin.ui.components.colorpicker.ColorPickerPopup;
-import com.vaadin.ui.components.colorpicker.ColorSelector;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
+import com.vaadin.v7.ui.components.colorpicker.ColorChangeEvent;
+import com.vaadin.v7.ui.components.colorpicker.ColorChangeListener;
+import com.vaadin.v7.ui.components.colorpicker.ColorPickerPopup;
+import com.vaadin.v7.ui.components.colorpicker.ColorSelector;
 
 /**
  * An abstract class that defines default implementation for a color picker
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
index 5411a63c15..b7b241598b 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -31,10 +31,6 @@ import java.util.Set;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
@@ -51,21 +47,26 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.shared.ui.select.AbstractSelectState;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
 import com.vaadin.ui.declarative.DesignFormatter;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
-import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
-import com.vaadin.v7.ui.LegacyAbstractField;
+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;
 
 /**
  * <p>
  * A class representing a selection of items the user has selected in a UI. The
- * set of choices is presented as a set of {@link com.vaadin.data.Item}s in a
- * {@link com.vaadin.data.Container}.
+ * set of choices is presented as a set of {@link com.com.vaadin.v7.data.Item}s
+ * in a {@link com.com.vaadin.v7.data.Container}.
  * </p>
  *
  * <p>
@@ -79,7 +80,7 @@ import com.vaadin.v7.ui.LegacyAbstractField;
  */
 @SuppressWarnings("serial")
 // TODO currently cannot specify type more precisely in case of multi-select
-public abstract class AbstractSelect extends LegacyAbstractField<Object>
+public abstract class AbstractSelect extends AbstractField<Object>
         implements Container, Container.Viewer,
         Container.PropertySetChangeListener,
         Container.PropertySetChangeNotifier, Container.ItemSetChangeNotifier,
@@ -643,7 +644,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Gets the selected item id or in multiselect mode a set of selected ids.
      *
-     * @see com.vaadin.v7.ui.LegacyAbstractField#getValue()
+     * @see com.vaadin.v7.ui.AbstractField#getValue()
      */
     @Override
     public Object getValue() {
@@ -683,7 +684,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      *
      * @param newValue
      *            the New selected item or collection of selected items.
-     * @see com.vaadin.v7.ui.LegacyAbstractField#setValue(java.lang.Object)
+     * @see com.vaadin.v7.ui.AbstractField#setValue(java.lang.Object)
      */
     @Override
     public void setValue(Object newValue) throws Property.ReadOnlyException {
@@ -710,13 +711,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      *            True if caller is sure that repaint is not needed.
      * @param ignoreReadOnly
      *            True if read-only check should be omitted.
-     * @see com.vaadin.v7.ui.LegacyAbstractField#setValue(java.lang.Object,
+     * @see com.vaadin.v7.ui.AbstractField#setValue(java.lang.Object,
      *      java.lang.Boolean)
      */
     @Override
     protected void setValue(Object newFieldValue, boolean repaintIsNotNeeded,
             boolean ignoreReadOnly)
-            throws com.vaadin.data.Property.ReadOnlyException,
+            throws com.vaadin.v7.data.Property.ReadOnlyException,
             ConversionException, InvalidValueException {
         if (isMultiSelect()) {
             if (newFieldValue == null) {
@@ -774,7 +775,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      *
      * @param propertyId
      *            the Id identifying the property.
-     * @see com.vaadin.data.Container#getType(java.lang.Object)
+     * @see com.com.vaadin.v7.data.Container#getType(java.lang.Object)
      */
     @Override
     public Class<?> getType(Object propertyId) {
@@ -814,7 +815,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * Gets the Property identified by the given itemId and propertyId from the
      * Container
      *
-     * @see com.vaadin.data.Container#getContainerProperty(Object, Object)
+     * @see com.com.vaadin.v7.data.Container#getContainerProperty(Object,
+     *      Object)
      */
     @Override
     public Property getContainerProperty(Object itemId, Object propertyId) {
@@ -829,7 +831,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * returns false.
      *
      * @return True if the operation succeeded.
-     * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object,
+     * @see com.com.vaadin.v7.data.Container#addContainerProperty(java.lang.Object,
      *      java.lang.Class, java.lang.Object)
      */
     @Override
@@ -851,7 +853,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * returns false.
      *
      * @return True if the operation succeeded.
-     * @see com.vaadin.data.Container#removeAllItems()
+     * @see com.com.vaadin.v7.data.Container#removeAllItems()
      */
     @Override
     public boolean removeAllItems() throws UnsupportedOperationException {
@@ -873,7 +875,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * method. if the creation fails, null is returned.
      *
      * @return the Id of the created item or null in case of failure.
-     * @see com.vaadin.data.Container#addItem()
+     * @see com.com.vaadin.v7.data.Container#addItem()
      */
     @Override
     public Object addItem() throws UnsupportedOperationException {
@@ -898,7 +900,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * @param itemId
      *            the Identification of the item to be created.
      * @return the Created item with the given id, or null in case of failure.
-     * @see com.vaadin.data.Container#addItem(java.lang.Object)
+     * @see com.com.vaadin.v7.data.Container#addItem(java.lang.Object)
      */
     @Override
     public Item addItem(Object itemId) throws UnsupportedOperationException {
@@ -1005,7 +1007,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * returns false.
      *
      * @return True if the operation succeeded.
-     * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object)
+     * @see com.com.vaadin.v7.data.Container#removeContainerProperty(java.lang.Object)
      */
     @Override
     public boolean removeContainerProperty(Object propertyId)
@@ -1026,7 +1028,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
      * As a side-effect the fields value (selection) is set to null due old
      * selection not necessary exists in new Container.
      *
-     * @see com.vaadin.data.Container.Viewer#setContainerDataSource(Container)
+     * @see com.com.vaadin.v7.data.Container.Viewer#setContainerDataSource(Container)
      *
      * @param newDataSource
      *            the new data source.
@@ -1085,7 +1087,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Gets the viewing data-source container.
      *
-     * @see com.vaadin.data.Container.Viewer#getContainerDataSource()
+     * @see com.com.vaadin.v7.data.Container.Viewer#getContainerDataSource()
      */
     @Override
     public Container getContainerDataSource() {
@@ -1263,10 +1265,10 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     private String idToCaption(Object itemId) {
         try {
-            LegacyConverter<String, Object> c = (LegacyConverter<String, Object>) LegacyConverterUtil
+            Converter<String, Object> c = (Converter<String, Object>) ConverterUtil
                     .getConverter(String.class, itemId.getClass(),
                             getSession());
-            return LegacyConverterUtil.convertFromModel(itemId, String.class, c,
+            return ConverterUtil.convertFromModel(itemId, String.class, c,
                     getLocale());
         } catch (Exception e) {
             return itemId.toString();
@@ -1563,7 +1565,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Notifies this listener that the Containers contents has changed.
      *
-     * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent)
+     * @see com.com.vaadin.v7.data.Container.PropertySetChangeListener#containerPropertySetChange(com.com.vaadin.v7.data.Container.PropertySetChangeEvent)
      */
     @Override
     public void containerPropertySetChange(
@@ -1574,7 +1576,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Adds a new Property set change listener for this Container.
      *
-     * @see com.vaadin.data.Container.PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener)
+     * @see com.com.vaadin.v7.data.Container.PropertySetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)
      */
     @Override
     public void addPropertySetChangeListener(
@@ -1587,7 +1589,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #addPropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -1598,7 +1600,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Removes a previously registered Property set change listener.
      *
-     * @see com.vaadin.data.Container.PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.PropertySetChangeListener)
+     * @see com.com.vaadin.v7.data.Container.PropertySetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)
      */
     @Override
     public void removePropertySetChangeListener(
@@ -1613,7 +1615,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     *             {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -1624,7 +1626,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Adds an Item set change listener for the object.
      *
-     * @see com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener)
+     * @see com.com.vaadin.v7.data.Container.ItemSetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)
      */
     @Override
     public void addItemSetChangeListener(
@@ -1637,7 +1639,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -1648,7 +1650,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Removes the Item set change listener from the object.
      *
-     * @see com.vaadin.data.Container.ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener)
+     * @see com.com.vaadin.v7.data.Container.ItemSetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)
      */
     @Override
     public void removeItemSetChangeListener(
@@ -1663,7 +1665,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
     /**
      * @deprecated As of 7.0, replaced by
-     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     *             {@link #removeItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)}
      **/
     @Override
     @Deprecated
@@ -1696,7 +1698,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Lets the listener know a Containers Item set has changed.
      *
-     * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent)
+     * @see com.com.vaadin.v7.data.Container.ItemSetChangeListener#containerItemSetChange(com.com.vaadin.v7.data.Container.ItemSetChangeEvent)
      */
     @Override
     public void containerItemSetChange(Container.ItemSetChangeEvent event) {
@@ -1753,7 +1755,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
         /**
          * Gets the Property where the event occurred.
          *
-         * @see com.vaadin.data.Container.ItemSetChangeEvent#getContainer()
+         * @see com.com.vaadin.v7.data.Container.ItemSetChangeEvent#getContainer()
          */
         @Override
         public Container getContainer() {
@@ -1775,7 +1777,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
         /**
          * Retrieves the Container whose contents have been modified.
          *
-         * @see com.vaadin.data.Container.PropertySetChangeEvent#getContainer()
+         * @see com.com.vaadin.v7.data.Container.PropertySetChangeEvent#getContainer()
          */
         @Override
         public Container getContainer() {
@@ -1874,7 +1876,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
     /**
      * Notifies the component that it is connected to an application.
      *
-     * @see com.vaadin.v7.ui.LegacyAbstractField#attach()
+     * @see com.vaadin.v7.ui.AbstractField#attach()
      */
     @Override
     public void attach() {
@@ -1987,13 +1989,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object>
 
         @Override
         public void valueChange(
-                com.vaadin.data.Property.ValueChangeEvent event) {
+                com.vaadin.v7.data.Property.ValueChangeEvent event) {
             markAsDirty();
         }
 
         @Override
         public void itemPropertySetChange(
-                com.vaadin.data.Item.PropertySetChangeEvent event) {
+                com.vaadin.v7.data.Item.PropertySetChangeEvent event) {
             markAsDirty();
         }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Calendar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java
index 1a2c7ef716..5c6e0de421 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/Calendar.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.lang.reflect.Method;
 import java.text.DateFormat;
@@ -41,8 +41,6 @@ import java.util.logging.Logger;
 import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.util.BeanItemContainer;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.dd.DropHandler;
@@ -55,41 +53,45 @@ import com.vaadin.shared.ui.calendar.CalendarEventId;
 import com.vaadin.shared.ui.calendar.CalendarServerRpc;
 import com.vaadin.shared.ui.calendar.CalendarState;
 import com.vaadin.shared.ui.calendar.DateConstants;
-import com.vaadin.ui.components.calendar.CalendarComponentEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResize;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.MoveEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.RangeSelectEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.RangeSelectHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
-import com.vaadin.ui.components.calendar.CalendarDateRange;
-import com.vaadin.ui.components.calendar.CalendarTargetDetails;
-import com.vaadin.ui.components.calendar.ContainerEventProvider;
-import com.vaadin.ui.components.calendar.event.BasicEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEditableEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeListener;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
-import com.vaadin.ui.components.calendar.handler.BasicBackwardHandler;
-import com.vaadin.ui.components.calendar.handler.BasicDateClickHandler;
-import com.vaadin.ui.components.calendar.handler.BasicEventMoveHandler;
-import com.vaadin.ui.components.calendar.handler.BasicEventResizeHandler;
-import com.vaadin.ui.components.calendar.handler.BasicForwardHandler;
-import com.vaadin.ui.components.calendar.handler.BasicWeekClickHandler;
+import com.vaadin.ui.AbstractComponent;
+import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResize;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.MoveEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.RangeSelectEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.RangeSelectHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarDateRange;
+import com.vaadin.v7.ui.components.calendar.CalendarTargetDetails;
+import com.vaadin.v7.ui.components.calendar.ContainerEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.BasicEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEditableEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeListener;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider;
+import com.vaadin.v7.ui.components.calendar.handler.BasicBackwardHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicDateClickHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicEventMoveHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicEventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicForwardHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicWeekClickHandler;
 
 /**
  * <p>
@@ -1521,7 +1523,7 @@ public class Calendar extends AbstractComponent
      * Use this method if you are adding a container which uses the default
      * property ids like {@link BeanItemContainer} for instance. If you are
      * using custom properties instead use
-     * {@link Calendar#setContainerDataSource(com.vaadin.data.Container.Indexed, Object, Object, Object, Object, Object)}
+     * {@link Calendar#setContainerDataSource(com.vaadin.v7.data.Container.Indexed, Object, Object, Object, Object, Object)}
      *
      * Please note that the container must be sorted by date!
      *
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ColorPicker.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPicker.java
index 67002373d0..34b03a2447 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/ColorPicker.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPicker.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import com.vaadin.shared.ui.colorpicker.Color;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ColorPickerArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPickerArea.java
index c4f3971259..624d567ec7 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/ColorPickerArea.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPickerArea.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import com.vaadin.shared.ui.colorpicker.Color;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ComboBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java
index a78823d9a3..50b6ac505c 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/ComboBox.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -24,8 +24,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.util.filter.SimpleStringFilter;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
@@ -38,6 +36,9 @@ import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.combobox.ComboBoxServerRpc;
 import com.vaadin.shared.ui.combobox.ComboBoxState;
 import com.vaadin.shared.ui.combobox.FilteringMode;
+import com.vaadin.ui.Component;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.filter.SimpleStringFilter;
 
 /**
  * A filtering dropdown single-select. Suitable for newItemsAllowed, but it's
@@ -794,7 +795,7 @@ public class ComboBox extends AbstractSelect
      *
      * @deprecated As of 7.0, use {@link ListSelect}, {@link OptionGroup} or
      *             {@link TwinColSelect} instead
-     * @see com.vaadin.ui.AbstractSelect#setMultiSelect(boolean)
+     * @see com.vaadin.v7.ui.AbstractSelect#setMultiSelect(boolean)
      * @throws UnsupportedOperationException
      *             if trying to activate multiselect mode
      */
@@ -813,7 +814,7 @@ public class ComboBox extends AbstractSelect
      * @deprecated As of 7.0, use {@link ListSelect}, {@link OptionGroup} or
      *             {@link TwinColSelect} instead
      *
-     * @see com.vaadin.ui.AbstractSelect#isMultiSelect()
+     * @see com.vaadin.v7.ui.AbstractSelect#isMultiSelect()
      *
      * @return false
      */
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyDateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
index 0d094c28bf..b02e7b87a4 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyDateField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java
@@ -27,7 +27,6 @@ import java.util.logging.Logger;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Property;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
@@ -42,10 +41,11 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
+import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Validator;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.validator.LegacyDateRangeValidator;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.validator.DateRangeValidator;
 
 /**
  * <p>
@@ -54,11 +54,11 @@ import com.vaadin.v7.data.validator.LegacyDateRangeValidator;
  * </p>
  * <p>
  * Since <code>DateField</code> extends <code>LegacyAbstractField</code> it
- * implements the {@link com.vaadin.data.Buffered}interface.
+ * implements the {@link com.vaadin.v7.data.Buffered}interface.
  * </p>
  * <p>
  * A <code>DateField</code> is in write-through mode by default, so
- * {@link com.vaadin.v7.ui.LegacyAbstractField#setWriteThrough(boolean)}must
+ * {@link com.vaadin.v7.ui.AbstractField#setWriteThrough(boolean)}must
  * be called to enable buffering.
  * </p>
  *
@@ -66,7 +66,7 @@ import com.vaadin.v7.data.validator.LegacyDateRangeValidator;
  * @since 3.0
  */
 @SuppressWarnings("serial")
-public class LegacyDateField extends LegacyAbstractField<Date> implements
+public class DateField extends AbstractField<Date> implements
         FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, LegacyComponent {
 
     /**
@@ -157,7 +157,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
 
     private String dateOutOfRangeMessage = "Date is out of allowed range";
 
-    private LegacyDateRangeValidator currentRangeValidator;
+    private DateRangeValidator currentRangeValidator;
 
     /**
      * Determines whether the ValueChangeEvent should be fired. Used to prevent
@@ -180,7 +180,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
     /**
      * Constructs an empty <code>DateField</code> with no caption.
      */
-    public LegacyDateField() {
+    public DateField() {
     }
 
     /**
@@ -189,7 +189,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * @param caption
      *            the caption of the datefield.
      */
-    public LegacyDateField(String caption) {
+    public DateField(String caption) {
         setCaption(caption);
     }
 
@@ -202,7 +202,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * @param dataSource
      *            the Property to be edited with this editor.
      */
-    public LegacyDateField(String caption, Property dataSource) {
+    public DateField(String caption, Property dataSource) {
         this(dataSource);
         setCaption(caption);
     }
@@ -214,7 +214,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * @param dataSource
      *            the Property to be edited with this editor.
      */
-    public LegacyDateField(Property dataSource)
+    public DateField(Property dataSource)
             throws IllegalArgumentException {
         if (!Date.class.isAssignableFrom(dataSource.getType())) {
             throw new IllegalArgumentException(
@@ -229,7 +229,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * Constructs a new <code>DateField</code> with the given caption and
      * initial text contents. The editor constructed this way will not be bound
      * to a Property unless
-     * {@link com.vaadin.data.Property.Viewer#setPropertyDataSource(Property)}
+     * {@link com.vaadin.v7.data.Property.Viewer#setPropertyDataSource(Property)}
      * is called to bind it.
      *
      * @param caption
@@ -237,7 +237,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * @param value
      *            the Date value.
      */
-    public LegacyDateField(String caption, Date value) {
+    public DateField(String caption, Date value) {
         setValue(value);
         setCaption(caption);
     }
@@ -421,7 +421,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
             currentRangeValidator = null;
         }
         if (getRangeStart() != null || getRangeEnd() != null) {
-            currentRangeValidator = new LegacyDateRangeValidator(
+            currentRangeValidator = new DateRangeValidator(
                     dateOutOfRangeMessage, getRangeStart(resolution),
                     getRangeEnd(resolution), null);
             addValidator(currentRangeValidator);
@@ -555,7 +555,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
                      * this case the invalid text remains in the DateField.
                      */
                     markAsDirty();
-                } catch (LegacyConverter.ConversionException e) {
+                } catch (Converter.ConversionException e) {
 
                     /*
                      * Datefield now contains some text that could't be parsed
@@ -650,9 +650,9 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      *             to keep the old value and indicate an error
      */
     protected Date handleUnparsableDateString(String dateString)
-            throws LegacyConverter.ConversionException {
+            throws Converter.ConversionException {
         currentParseErrorMessage = null;
-        throw new LegacyConverter.ConversionException(getParseErrorMessage());
+        throw new Converter.ConversionException(getParseErrorMessage());
     }
 
     /* Property features */
@@ -886,7 +886,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
      * invalid if it contains text typed in by the user that couldn't be parsed
      * into a Date value.
      *
-     * @see com.vaadin.v7.ui.LegacyAbstractField#validate()
+     * @see com.vaadin.v7.ui.AbstractField#validate()
      */
     @Override
     public void validate() throws InvalidValueException {
@@ -980,7 +980,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements
                     .parse(design.attr("value"), Date.class);
             // formatting will return null if it cannot parse the string
             if (date == null) {
-                Logger.getLogger(LegacyDateField.class.getName()).info(
+                Logger.getLogger(DateField.class.getName()).info(
                         "cannot parse " + design.attr("value") + " as date");
             }
             this.setValue(date, false, true);
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java
index 2ee5ecf00e..53035ba087 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java
@@ -13,18 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.text.Normalizer.Form;
 import java.util.Date;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Property;
 import com.vaadin.shared.util.SharedUtil;
-import com.vaadin.v7.ui.LegacyCheckBox;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.ui.Component;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Property;
 
 /**
  * This class contains a basic implementation for {@link TableFieldFactory}. The
@@ -53,12 +50,12 @@ public class DefaultFieldFactory implements TableFieldFactory {
     }
 
     @Override
-    public LegacyField createField(Container container, Object itemId,
+    public Field createField(Container container, Object itemId,
             Object propertyId, Component uiContext) {
         Property containerProperty = container.getContainerProperty(itemId,
                 propertyId);
         Class<?> type = containerProperty.getType();
-        LegacyField<?> field = createFieldByPropertyType(type);
+        Field<?> field = createFieldByPropertyType(type);
         field.setCaption(createCaptionByPropertyId(propertyId));
         return field;
     }
@@ -77,20 +74,20 @@ public class DefaultFieldFactory implements TableFieldFactory {
     /**
      * Creates fields based on the property type.
      * <p>
-     * The default field type is {@link LegacyTextField}. Other field types
-     * generated by this method:
+     * The default field type is {@link TextField}. Other field types generated
+     * by this method:
      * <p>
      * <b>Boolean</b>: {@link CheckBox}.<br/>
-     * <b>Date</b>: {@link LegacyDateField}(resolution: day).<br/>
+     * <b>Date</b>: {@link DateField}(resolution: day).<br/>
      * <b>Item</b>: {@link Form}. <br/>
-     * <b>default field type</b>: {@link LegacyTextField}.
+     * <b>default field type</b>: {@link TextField}.
      * <p>
      *
      * @param type
      *            the type of the property
-     * @return the most suitable generic {@link LegacyField} for given type
+     * @return the most suitable generic {@link Field} for given type
      */
-    public static LegacyField<?> createFieldByPropertyType(Class<?> type) {
+    public static Field<?> createFieldByPropertyType(Class<?> type) {
         // Null typed properties can not be edited
         if (type == null) {
             return null;
@@ -98,17 +95,17 @@ public class DefaultFieldFactory implements TableFieldFactory {
 
         // Date field
         if (Date.class.isAssignableFrom(type)) {
-            final LegacyDateField df = new LegacyDateField();
-            df.setResolution(LegacyDateField.RESOLUTION_DAY);
+            final DateField df = new DateField();
+            df.setResolution(DateField.RESOLUTION_DAY);
             return df;
         }
 
         // Boolean field
         if (Boolean.class.isAssignableFrom(type)) {
-            return new LegacyCheckBox();
+            return new CheckBox();
         }
 
-        return new LegacyTextField();
+        return new TextField();
     }
 
 }
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/LegacyGrid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
index 9a98593b83..0a5e5b40a4 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/LegacyGrid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -42,24 +42,8 @@ import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Container.ItemSetChangeNotifier;
-import com.vaadin.data.Container.PropertySetChangeEvent;
-import com.vaadin.data.Container.PropertySetChangeListener;
-import com.vaadin.data.Container.PropertySetChangeNotifier;
-import com.vaadin.data.Container.Sortable;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.fieldgroup.DefaultFieldGroupFieldFactory;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.fieldgroup.FieldGroupFieldFactory;
 import com.vaadin.data.sort.Sort;
 import com.vaadin.data.sort.SortOrder;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.ContextClickEvent;
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
@@ -78,8 +62,6 @@ import com.vaadin.server.Extension;
 import com.vaadin.server.JsonCodec;
 import com.vaadin.server.KeyMapper;
 import com.vaadin.server.VaadinSession;
-import com.vaadin.server.communication.data.DataGenerator;
-import com.vaadin.server.communication.data.RpcDataProviderExtension;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.shared.ui.grid.EditorClientRpc;
@@ -101,19 +83,40 @@ import com.vaadin.shared.ui.grid.selection.MultiSelectionModelState;
 import com.vaadin.shared.ui.grid.selection.SingleSelectionModelServerRpc;
 import com.vaadin.shared.ui.grid.selection.SingleSelectionModelState;
 import com.vaadin.shared.util.SharedUtil;
+import com.vaadin.ui.AbstractFocusable;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ConnectorTracker;
+import com.vaadin.ui.SelectiveRenderer;
+import com.vaadin.ui.UI;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
 import com.vaadin.ui.declarative.DesignFormatter;
-import com.vaadin.ui.renderers.HtmlRenderer;
-import com.vaadin.ui.renderers.Renderer;
-import com.vaadin.ui.renderers.TextRenderer;
 import com.vaadin.util.ReflectTools;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Container.ItemSetChangeNotifier;
+import com.vaadin.v7.data.Container.PropertySetChangeEvent;
+import com.vaadin.v7.data.Container.PropertySetChangeListener;
+import com.vaadin.v7.data.Container.PropertySetChangeNotifier;
+import com.vaadin.v7.data.Container.Sortable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
-import com.vaadin.v7.ui.LegacyCheckBox;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.fieldgroup.DefaultFieldGroupFieldFactory;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.fieldgroup.FieldGroupFieldFactory;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.util.converter.ConverterUtil;
+import com.vaadin.v7.server.communication.data.DataGenerator;
+import com.vaadin.v7.server.communication.data.RpcDataProviderExtension;
+import com.vaadin.v7.ui.renderers.HtmlRenderer;
+import com.vaadin.v7.ui.renderers.Renderer;
+import com.vaadin.v7.ui.renderers.TextRenderer;
 
 import elemental.json.Json;
 import elemental.json.JsonObject;
@@ -134,7 +137,7 @@ import elemental.json.JsonValue;
  * <p>
  * Each column has its own {@link Renderer} that displays data into something
  * that can be displayed in the browser. That data is first converted with a
- * {@link com.vaadin.v7.data.util.converter.LegacyConverter Converter} into
+ * {@link com.vaadin.v7.data.util.converter.Converter Converter} into
  * something that the Renderer can process. This can also be an implicit step -
  * if a column has a simple data type, like a String, no explicit assignment is
  * needed.
@@ -181,7 +184,7 @@ import elemental.json.JsonValue;
  * @since 7.4
  * @author Vaadin Ltd
  */
-public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
+public class Grid extends AbstractFocusable implements SelectionNotifier,
         SortNotifier, SelectiveRenderer, ItemClickNotifier {
 
     /**
@@ -223,7 +226,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *            <code>true</code> iff the event was triggered by an UI
          *            interaction
          */
-        public ColumnVisibilityChangeEvent(LegacyGrid source, Column column,
+        public ColumnVisibilityChangeEvent(Grid source, Column column,
                 boolean hidden, boolean isUserOriginated) {
             super(source);
             this.column = column;
@@ -335,11 +338,11 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          */
         private final Set<Object> openDetails = new HashSet<>();
 
-        public DetailComponentManager(LegacyGrid grid) {
+        public DetailComponentManager(Grid grid) {
             this(grid, DetailsGenerator.NULL);
         }
 
-        public DetailComponentManager(LegacyGrid grid,
+        public DetailComponentManager(Grid grid,
                 DetailsGenerator detailsGenerator) {
             super(grid);
             setDetailsGenerator(detailsGenerator);
@@ -349,7 +352,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * Creates a details component with the help of the user-defined
          * {@link DetailsGenerator}.
          * <p>
-         * This method attaches created components to the parent {@link LegacyGrid}.
+         * This method attaches created components to the parent {@link Grid}.
          *
          * @param itemId
          *            the item id for which to create the details component.
@@ -397,7 +400,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         /**
          * Destroys a details component correctly.
          * <p>
-         * This method will detach the component from parent {@link LegacyGrid}.
+         * This method will detach the component from parent {@link Grid}.
          *
          * @param itemId
          *            the item id for which to destroy the details component
@@ -541,10 +544,10 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         @Override
-        protected <T extends LegacyField> T build(String caption,
+        protected <T extends Field> T build(String caption,
                 Class<?> dataType, Class<T> fieldType) throws BindException {
             T field = super.build(caption, dataType, fieldType);
-            if (field instanceof LegacyCheckBox) {
+            if (field instanceof CheckBox) {
                 field.setCaption(null);
             }
             return field;
@@ -574,7 +577,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         @Override
-        public <T extends LegacyField> T createField(Class<?> type,
+        public <T extends Field> T createField(Class<?> type,
                 Class<T> fieldType) {
             T f = super.createField(type, fieldType);
             if (f != null) {
@@ -631,7 +634,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         private final Object propertyId;
         private final Section section;
 
-        public GridContextClickEvent(LegacyGrid source,
+        public GridContextClickEvent(Grid source,
                 MouseEventDetails mouseEventDetails, Section section,
                 int rowIndex, Object itemId, Object propertyId) {
             super(source, mouseEventDetails);
@@ -672,7 +675,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * Returns the clicked row index relative to Grid section. In the body
          * of the Grid the index is the item index in the Container. Header and
          * Footer rows for index can be fetched with
-         * {@link LegacyGrid#getHeaderRow(int)} and {@link LegacyGrid#getFooterRow(int)}.
+         * {@link Grid#getHeaderRow(int)} and {@link Grid#getFooterRow(int)}.
          *
          * @return row index in section
          */
@@ -681,8 +684,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         @Override
-        public LegacyGrid getComponent() {
-            return (LegacyGrid) super.getComponent();
+        public Grid getComponent() {
+            return (Grid) super.getComponent();
         }
     }
 
@@ -697,7 +700,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         private String userErrorMessage;
 
-        public CommitErrorEvent(LegacyGrid grid, CommitException cause) {
+        public CommitErrorEvent(Grid grid, CommitException cause) {
             super(grid);
             this.cause = cause;
             userErrorMessage = cause.getLocalizedMessage();
@@ -713,8 +716,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         @Override
-        public LegacyGrid getComponent() {
-            return (LegacyGrid) super.getComponent();
+        public Grid getComponent() {
+            return (Grid) super.getComponent();
         }
 
         /**
@@ -800,7 +803,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *            <code>true</code> if event is a result of user
          *            interaction, <code>false</code> if from API call
          */
-        public ColumnReorderEvent(LegacyGrid source, boolean userOriginated) {
+        public ColumnReorderEvent(Grid source, boolean userOriginated) {
             super(source);
             this.userOriginated = userOriginated;
         }
@@ -852,7 +855,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *            <code>true</code> if event is a result of user
          *            interaction, <code>false</code> if from API call
          */
-        public ColumnResizeEvent(LegacyGrid source, Column column,
+        public ColumnResizeEvent(Grid source, Column column,
                 boolean userOriginated) {
             super(source);
             this.column = column;
@@ -926,7 +929,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         private Object itemID;
 
-        protected EditorEvent(LegacyGrid source, Object itemID) {
+        protected EditorEvent(Grid source, Object itemID) {
             super(source);
             this.itemID = itemID;
         }
@@ -945,7 +948,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      */
     public static class EditorOpenEvent extends EditorEvent {
 
-        public EditorOpenEvent(LegacyGrid source, Object itemID) {
+        public EditorOpenEvent(Grid source, Object itemID) {
             super(source, itemID);
         }
     }
@@ -956,7 +959,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      */
     public static class EditorMoveEvent extends EditorEvent {
 
-        public EditorMoveEvent(LegacyGrid source, Object itemID) {
+        public EditorMoveEvent(Grid source, Object itemID) {
             super(source, itemID);
         }
     }
@@ -967,7 +970,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      */
     public static class EditorCloseEvent extends EditorEvent {
 
-        public EditorCloseEvent(LegacyGrid source, Object itemID) {
+        public EditorCloseEvent(Grid source, Object itemID) {
             super(source, itemID);
         }
     }
@@ -980,17 +983,17 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         @Override
         public void commitError(CommitErrorEvent event) {
-            Map<LegacyField<?>, InvalidValueException> invalidFields = event
+            Map<Field<?>, InvalidValueException> invalidFields = event
                     .getCause().getInvalidFields();
 
             if (!invalidFields.isEmpty()) {
                 Object firstErrorPropertyId = null;
-                LegacyField<?> firstErrorField = null;
+                Field<?> firstErrorField = null;
 
                 FieldGroup fieldGroup = event.getCause().getFieldGroup();
                 for (Column column : getColumns()) {
                     Object propertyId = column.getPropertyId();
-                    LegacyField<?> field = fieldGroup.getField(propertyId);
+                    Field<?> field = fieldGroup.getField(propertyId);
                     if (invalidFields.keySet().contains(field)) {
                         event.addErrorColumn(column);
 
@@ -1012,16 +1015,16 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
                 event.setUserErrorMessage(caption + ": " + message);
             } else {
-                com.vaadin.server.ErrorEvent.findErrorHandler(LegacyGrid.this).error(
-                        new ConnectorErrorEvent(LegacyGrid.this, event.getCause()));
+                com.vaadin.server.ErrorEvent.findErrorHandler(Grid.this).error(
+                        new ConnectorErrorEvent(Grid.this, event.getCause()));
             }
         }
 
         private Object getFirstPropertyId(FieldGroup fieldGroup,
-                Set<LegacyField<?>> keySet) {
+                Set<Field<?>> keySet) {
             for (Column c : getColumns()) {
                 Object propertyId = c.getPropertyId();
-                LegacyField<?> f = fieldGroup.getField(propertyId);
+                Field<?> f = fieldGroup.getField(propertyId);
                 if (keySet.contains(f)) {
                     return propertyId;
                 }
@@ -1032,15 +1035,15 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * Selection modes representing built-in {@link SelectionModel
-     * SelectionModels} that come bundled with {@link LegacyGrid}.
+     * SelectionModels} that come bundled with {@link Grid}.
      * <p>
      * Passing one of these enums into
-     * {@link LegacyGrid#setSelectionMode(SelectionMode)} is equivalent to calling
-     * {@link LegacyGrid#setSelectionModel(SelectionModel)} with one of the built-in
+     * {@link Grid#setSelectionMode(SelectionMode)} is equivalent to calling
+     * {@link Grid#setSelectionModel(SelectionModel)} with one of the built-in
      * implementations of {@link SelectionModel}.
      *
-     * @see LegacyGrid#setSelectionMode(SelectionMode)
-     * @see LegacyGrid#setSelectionModel(SelectionModel)
+     * @see Grid#setSelectionMode(SelectionMode)
+     * @see Grid#setSelectionModel(SelectionModel)
      */
     public enum SelectionMode {
         /** A SelectionMode that maps to {@link SingleSelectionModel} */
@@ -1093,7 +1096,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         Collection<Object> getSelectedRows();
 
         /**
-         * Injects the current {@link LegacyGrid} instance into the SelectionModel.
+         * Injects the current {@link Grid} instance into the SelectionModel.
          * This method should usually call the extend method of
          * {@link AbstractExtension}.
          * <p>
@@ -1104,7 +1107,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *            <code>null</code> when a selection model is being detached
          *            from a Grid.
          */
-        void setGrid(LegacyGrid grid);
+        void setGrid(Grid grid);
 
         /**
          * Resets the SelectiomModel to an initial state.
@@ -1352,7 +1355,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         @Override
-        public void setGrid(final LegacyGrid grid) {
+        public void setGrid(final Grid grid) {
             if (grid != null) {
                 extend(grid);
             }
@@ -1891,7 +1894,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * A data class which contains information which identifies a row in a
-     * {@link LegacyGrid}.
+     * {@link Grid}.
      * <p>
      * Since this class follows the <code>Flyweight</code>-pattern any instance
      * of this object is subject to change without the user knowing it and so
@@ -1899,7 +1902,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * instances.
      */
     public static class RowReference implements Serializable {
-        private final LegacyGrid grid;
+        private final Grid grid;
 
         private Object itemId;
 
@@ -1909,7 +1912,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @param grid
          *            the grid that the row belongs to
          */
-        public RowReference(LegacyGrid grid) {
+        public RowReference(Grid grid) {
             this.grid = grid;
         }
 
@@ -1928,7 +1931,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *
          * @return the grid that contains referenced row
          */
-        public LegacyGrid getGrid() {
+        public Grid getGrid() {
             return grid;
         }
 
@@ -1953,7 +1956,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * A data class which contains information which identifies a cell in a
-     * {@link LegacyGrid}.
+     * {@link Grid}.
      * <p>
      * Since this class follows the <code>Flyweight</code>-pattern any instance
      * of this object is subject to change without the user knowing it and so
@@ -1984,7 +1987,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *
          * @return the grid that contains referenced cell
          */
-        public LegacyGrid getGrid() {
+        public Grid getGrid() {
             return rowReference.getGrid();
         }
 
@@ -2033,7 +2036,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
     /**
      * A callback interface for generating custom style names for Grid rows.
      *
-     * @see LegacyGrid#setRowStyleGenerator(RowStyleGenerator)
+     * @see Grid#setRowStyleGenerator(RowStyleGenerator)
      */
     public interface RowStyleGenerator extends Serializable {
 
@@ -2051,7 +2054,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
     /**
      * A callback interface for generating custom style names for Grid cells.
      *
-     * @see LegacyGrid#setCellStyleGenerator(CellStyleGenerator)
+     * @see Grid#setCellStyleGenerator(CellStyleGenerator)
      */
     public interface CellStyleGenerator extends Serializable {
 
@@ -2072,7 +2075,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * the cells in the row for which a {@link CellDescriptionGenerator cell
      * description} is not generated.
      *
-     * @see LegacyGrid#setRowDescriptionGenerator
+     * @see Grid#setRowDescriptionGenerator
      *
      * @since 7.6
      */
@@ -2096,7 +2099,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * Grid cells. If a cell has both a {@link RowDescriptionGenerator row
      * description} and a cell description, the latter has precedence.
      *
-     * @see LegacyGrid#setCellDescriptionGenerator(CellDescriptionGenerator)
+     * @see Grid#setCellDescriptionGenerator(CellDescriptionGenerator)
      *
      * @since 7.6
      */
@@ -2129,7 +2132,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         @Override
         public void generateData(Object itemId, Item item, JsonObject rowData) {
-            RowReference row = new RowReference(LegacyGrid.this);
+            RowReference row = new RowReference(Grid.this);
             row.set(itemId);
 
             if (rowStyleGenerator != null) {
@@ -2190,7 +2193,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         private void writeData(CellReference cell, JsonObject data) {
             Column column = getColumn(cell.getPropertyId());
-            LegacyConverter<?, ?> converter = column.getConverter();
+            Converter<?, ?> converter = column.getConverter();
             Renderer<?> renderer = column.getRenderer();
 
             Item item = cell.getItem();
@@ -2399,7 +2402,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
             protected void writeDesign(Element trElement,
                     DesignContext designContext) {
                 Set<CELLTYPE> visited = new HashSet<>();
-                for (LegacyGrid.Column column : section.grid.getColumns()) {
+                for (Grid.Column column : section.grid.getColumns()) {
                     CELLTYPE cell = getCell(column.getPropertyId());
                     if (visited.contains(cell)) {
                         continue;
@@ -2686,7 +2689,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
             }
         }
 
-        protected LegacyGrid grid;
+        protected Grid grid;
         protected List<ROWTYPE> rows = new ArrayList<>();
 
         /**
@@ -2968,7 +2971,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         private HeaderRow defaultRow = null;
         private final GridStaticSectionState headerState = new GridStaticSectionState();
 
-        protected Header(LegacyGrid grid) {
+        protected Header(Grid grid) {
             this.grid = grid;
             grid.getState(true).header = headerState;
             HeaderRow row = createRow();
@@ -3137,7 +3140,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
         private final GridStaticSectionState footerState = new GridStaticSectionState();
 
-        protected Footer(LegacyGrid grid) {
+        protected Footer(Grid grid) {
             this.grid = grid;
             grid.getState(true).footer = footerState;
         }
@@ -3191,7 +3194,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * A column in the grid. Can be obtained by calling
-     * {@link LegacyGrid#getColumn(Object propertyId)}.
+     * {@link Grid#getColumn(Object propertyId)}.
      */
     public static class Column implements Serializable {
 
@@ -3203,19 +3206,19 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         /**
          * The grid this column is associated with
          */
-        private final LegacyGrid grid;
+        private final Grid grid;
 
         /**
          * Backing property for column
          */
         private final Object propertyId;
 
-        private LegacyConverter<?, Object> converter;
+        private Converter<?, Object> converter;
 
         /**
          * A check for allowing the
-         * {@link #Column(LegacyGrid, GridColumnState, Object) constructor} to call
-         * {@link #setConverter(LegacyConverter)} with a <code>null</code>, even
+         * {@link #Column(Grid, GridColumnState, Object) constructor} to call
+         * {@link #setConverter(Converter)} with a <code>null</code>, even
          * if model and renderer aren't compatible.
          */
         private boolean isFirstConverterAssignment = true;
@@ -3230,7 +3233,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @param propertyId
          *            the backing property id for this column
          */
-        Column(LegacyGrid grid, GridColumnState state, Object propertyId) {
+        Column(Grid grid, GridColumnState state, Object propertyId) {
             this.grid = grid;
             this.state = state;
             this.propertyId = propertyId;
@@ -3433,7 +3436,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *
          * @throws IllegalArgumentException
          *             if the column is no longer attached to any grid
-         * @see LegacyGrid#setFrozenColumnCount(int)
+         * @see Grid#setFrozenColumnCount(int)
          */
         public Column setLastFrozenColumn() {
             checkColumnIsAttached();
@@ -3457,8 +3460,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *             if no compatible converter could be found
          *
          * @see VaadinSession#getConverterFactory()
-         * @see LegacyConverterUtil#getConverter(Class, Class, VaadinSession)
-         * @see #setConverter(LegacyConverter)
+         * @see ConverterUtil#getConverter(Class, Class, VaadinSession)
+         * @see #setConverter(Converter)
          */
         public Column setRenderer(Renderer<?> renderer) {
             if (!internalSetRenderer(renderer)) {
@@ -3486,7 +3489,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *             if the renderer is already associated with a grid column
          */
         public <T> Column setRenderer(Renderer<T> renderer,
-                LegacyConverter<? extends T, ?> converter) {
+                Converter<? extends T, ?> converter) {
             if (renderer.getParent() != null) {
                 throw new IllegalArgumentException(
                         "Cannot set a renderer that is already connected to a grid column (in "
@@ -3515,7 +3518,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @throws IllegalArgumentException
          *             if the types are not compatible
          */
-        public Column setConverter(LegacyConverter<?, ?> converter)
+        public Column setConverter(Converter<?, ?> converter)
                 throws IllegalArgumentException {
             Class<?> modelType = getModelType();
             if (converter != null) {
@@ -3566,7 +3569,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
             isFirstConverterAssignment = false;
 
             @SuppressWarnings("unchecked")
-            LegacyConverter<?, Object> castConverter = (LegacyConverter<?, Object>) converter;
+            Converter<?, Object> castConverter = (Converter<?, Object>) converter;
             this.converter = castConverter;
 
             return this;
@@ -3586,19 +3589,19 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *
          * @return the converter
          */
-        public LegacyConverter<?, ?> getConverter() {
+        public Converter<?, ?> getConverter() {
             return converter;
         }
 
         private <T> boolean internalSetRenderer(Renderer<T> renderer) {
 
-            LegacyConverter<? extends T, ?> converter;
+            Converter<? extends T, ?> converter;
             if (isCompatibleWithProperty(renderer, getConverter())) {
                 // Use the existing converter (possibly none) if types
                 // compatible
-                converter = (LegacyConverter<? extends T, ?>) getConverter();
+                converter = (Converter<? extends T, ?>) getConverter();
             } else {
-                converter = LegacyConverterUtil.getConverter(
+                converter = ConverterUtil.getConverter(
                         renderer.getPresentationType(), getModelType(),
                         getSession());
             }
@@ -3612,7 +3615,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
 
         private boolean isCompatibleWithProperty(Renderer<?> renderer,
-                LegacyConverter<?, ?> converter) {
+                Converter<?, ?> converter) {
             Class<?> type;
             if (converter == null) {
                 type = getModelType();
@@ -3837,8 +3840,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @throws IllegalStateException
          *             if the editor is currently active
          *
-         * @see LegacyGrid#editItem(Object)
-         * @see LegacyGrid#isEditorActive()
+         * @see Grid#editItem(Object)
+         * @see Grid#isEditorActive()
          */
         public Column setEditable(boolean editable) {
             checkColumnIsAttached();
@@ -3858,7 +3861,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @return {@code true} if this column is editable, {@code false}
          *         otherwise
          *
-         * @see LegacyGrid#editItem(Object)
+         * @see Grid#editItem(Object)
          * @see #setEditable(boolean)
          */
 
@@ -3880,7 +3883,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *            the editor field
          * @return this column
          */
-        public Column setEditorField(LegacyField<?> editor) {
+        public Column setEditorField(Field<?> editor) {
             grid.setEditorField(getPropertyId(), editor);
             return this;
         }
@@ -3896,7 +3899,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * Getting a field before the editor has been opened depends on special
          * support from the {@link FieldGroup} in use. Using this method with a
          * user-provided <code>FieldGroup</code> might cause
-         * {@link com.vaadin.data.fieldgroup.FieldGroup.BindException
+         * {@link com.vaadin.v7.data.fieldgroup.FieldGroup.BindException
          * BindException} to be thrown.
          *
          * @return the bound field; or <code>null</code> if the respective
@@ -3908,7 +3911,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          *             if no field has been configured and there is a problem
          *             building or binding
          */
-        public LegacyField<?> getEditorField() {
+        public Field<?> getEditorField() {
             return grid.getEditorField(getPropertyId());
         }
 
@@ -4115,7 +4118,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
 
     /**
      * An abstract base class for server-side
-     * {@link com.vaadin.ui.renderers.Renderer Grid renderers}. This class
+     * {@link com.vaadin.v7.ui.renderers.Renderer Grid renderers}. This class
      * currently extends the AbstractExtension superclass, but this fact should
      * be regarded as an implementation detail and subject to change in a future
      * major or minor Vaadin revision.
@@ -4146,8 +4149,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          */
         @Deprecated
         @Override
-        protected Class<LegacyGrid> getSupportedParentType() {
-            return LegacyGrid.class;
+        protected Class<Grid> getSupportedParentType() {
+            return Grid.class;
         }
 
         /**
@@ -4222,7 +4225,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @return an encoded value ready to be sent to the client
          */
         public static <T> JsonValue encodeValue(Object modelValue,
-                Renderer<T> renderer, LegacyConverter<?, ?> converter,
+                Renderer<T> renderer, Converter<?, ?> converter,
                 Locale locale) {
             Class<T> presentationType = renderer.getPresentationType();
             T presentationValue;
@@ -4237,7 +4240,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                         // Class.cast(null) will always succeed
                         presentationValue = (T) modelValue.toString();
                     } else {
-                        throw new LegacyConverter.ConversionException(
+                        throw new Converter.ConversionException(
                                 "Unable to convert value of type "
                                         + modelValue.getClass().getName()
                                         + " to presentation type "
@@ -4249,7 +4252,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                 assert presentationType
                         .isAssignableFrom(converter.getPresentationType());
                 @SuppressWarnings("unchecked")
-                LegacyConverter<T, Object> safeConverter = (LegacyConverter<T, Object>) converter;
+                Converter<T, Object> safeConverter = (Converter<T, Object>) converter;
                 presentationValue = safeConverter.convertToPresentation(
                         modelValue, safeConverter.getPresentationType(),
                         locale);
@@ -4297,7 +4300,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @param grid
          *            a grid instance
          */
-        public AbstractGridExtension(LegacyGrid grid) {
+        public AbstractGridExtension(Grid grid) {
             super();
             extend(grid);
         }
@@ -4359,9 +4362,9 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
          * @throws IllegalStateException
          *             if parent is not Grid
          */
-        protected LegacyGrid getParentGrid() {
-            if (getParent() instanceof LegacyGrid) {
-                LegacyGrid grid = (LegacyGrid) getParent();
+        protected Grid getParentGrid() {
+            if (getParent() instanceof Grid) {
+                Grid grid = (Grid) getParent();
                 return grid;
             } else if (getParent() == null) {
                 throw new IllegalStateException(
@@ -4559,7 +4562,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * Creates a new Grid with a new {@link IndexedContainer} as the data
      * source.
      */
-    public LegacyGrid() {
+    public Grid() {
         this(null, null);
     }
 
@@ -4569,7 +4572,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * @param dataSource
      *            the indexed container to use as a data source
      */
-    public LegacyGrid(final Container.Indexed dataSource) {
+    public Grid(final Container.Indexed dataSource) {
         this(null, dataSource);
     }
 
@@ -4580,7 +4583,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * @param caption
      *            the caption of the grid
      */
-    public LegacyGrid(String caption) {
+    public Grid(String caption) {
         this(caption, null);
     }
 
@@ -4593,7 +4596,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      * @param dataSource
      *            the indexed container to use as a data source
      */
-    public LegacyGrid(String caption, Container.Indexed dataSource) {
+    public Grid(String caption, Container.Indexed dataSource) {
         if (dataSource == null) {
             internalSetContainerDataSource(new IndexedContainer());
         } else {
@@ -4631,7 +4634,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                     ConnectorTracker connectorTracker = getUI()
                             .getConnectorTracker();
                     JsonObject diffState = connectorTracker
-                            .getDiffState(LegacyGrid.this);
+                            .getDiffState(Grid.this);
                     diffState.remove("sortColumns");
                     diffState.remove("sortDirs");
                     markAsDirty();
@@ -4644,7 +4647,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                 Object itemId = getKeyMapper().get(rowKey);
                 Item item = datasource.getItem(itemId);
                 Object propertyId = getPropertyIdByColumnId(columnId);
-                fireEvent(new ItemClickEvent(LegacyGrid.this, item, itemId,
+                fireEvent(new ItemClickEvent(Grid.this, item, itemId,
                         propertyId, details));
             }
 
@@ -4654,7 +4657,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                 final String diffStateKey = "columnOrder";
                 ConnectorTracker connectorTracker = getUI()
                         .getConnectorTracker();
-                JsonObject diffState = connectorTracker.getDiffState(LegacyGrid.this);
+                JsonObject diffState = connectorTracker.getDiffState(Grid.this);
                 // discard the change if the columns have been reordered from
                 // the server side, as the server side is always right
                 if (getState(false).columnOrder.equals(oldColumnOrder)) {
@@ -4701,7 +4704,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                     ConnectorTracker connectorTracker = getUI()
                             .getConnectorTracker();
                     JsonObject diffState = connectorTracker
-                            .getDiffState(LegacyGrid.this);
+                            .getDiffState(Grid.this);
 
                     assert diffState
                             .hasKey(diffStateKey) : "Field name has changed";
@@ -4734,7 +4737,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                 if (rowKey != null) {
                     itemId = getKeyMapper().get(rowKey);
                 }
-                fireEvent(new GridContextClickEvent(LegacyGrid.this, details, section,
+                fireEvent(new GridContextClickEvent(Grid.this, details, section,
                         rowIndex, itemId, getPropertyIdByColumnId(columnId)));
             }
 
@@ -4806,7 +4809,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                     success = true;
                 } catch (CommitException e) {
                     try {
-                        CommitErrorEvent event = new CommitErrorEvent(LegacyGrid.this,
+                        CommitErrorEvent event = new CommitErrorEvent(Grid.this,
                                 e);
                         getEditorErrorHandler().commitError(event);
 
@@ -4829,8 +4832,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
             }
 
             private void handleError(Exception e) {
-                com.vaadin.server.ErrorEvent.findErrorHandler(LegacyGrid.this)
-                        .error(new ConnectorErrorEvent(LegacyGrid.this, e));
+                com.vaadin.server.ErrorEvent.findErrorHandler(Grid.this)
+                        .error(new ConnectorErrorEvent(Grid.this, e));
             }
         });
     }
@@ -5154,9 +5157,9 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
     }
 
     /**
-     * Used internally by the {@link LegacyGrid} to get a {@link Column} by
+     * Used internally by the {@link Grid} to get a {@link Column} by
      * referencing its generated state id. Also used by {@link Column} to verify
-     * if it has been detached from the {@link LegacyGrid}.
+     * if it has been detached from the {@link Grid}.
      *
      * @param columnId
      *            the client id generated for the column when the column is
@@ -5169,7 +5172,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
     }
 
     /**
-     * Used internally by the {@link LegacyGrid} to get a property id by referencing
+     * Used internally by the {@link Grid} to get a property id by referencing
      * the columns generated state id.
      *
      * @param columnId
@@ -6652,7 +6655,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
     }
 
     private static Logger getLogger() {
-        return Logger.getLogger(LegacyGrid.class.getName());
+        return Logger.getLogger(Grid.class.getName());
     }
 
     /**
@@ -6746,14 +6749,14 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
     }
 
-    private LegacyField<?> getEditorField(Object propertyId) {
+    private Field<?> getEditorField(Object propertyId) {
         checkColumnExists(propertyId);
 
         if (!getColumn(propertyId).isEditable()) {
             return null;
         }
 
-        LegacyField<?> editor = editorFieldGroup.getField(propertyId);
+        Field<?> editor = editorFieldGroup.getField(propertyId);
 
         try {
             if (editor == null) {
@@ -6764,7 +6767,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
                 editor = editorFieldGroup.getField(propertyId);
             }
 
-            if (editor != null && editor.getParent() != LegacyGrid.this) {
+            if (editor != null && editor.getParent() != Grid.this) {
                 assert editor.getParent() == null;
                 editor.setParent(this);
             }
@@ -6817,7 +6820,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         editorActive = true;
         // Must ensure that all fields, recursively, are sent to the client
         // This is needed because the fields are hidden using isRendered
-        for (LegacyField<?> f : getEditorFields()) {
+        for (Field<?> f : getEditorFields()) {
             f.markAsDirtyRecursive();
         }
 
@@ -6827,10 +6830,10 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         }
     }
 
-    private void setEditorField(Object propertyId, LegacyField<?> field) {
+    private void setEditorField(Object propertyId, Field<?> field) {
         checkColumnExists(propertyId);
 
-        LegacyField<?> oldField = editorFieldGroup.getField(propertyId);
+        Field<?> oldField = editorFieldGroup.getField(propertyId);
         if (oldField != null) {
             editorFieldGroup.unbind(oldField);
             oldField.setParent(null);
@@ -6892,7 +6895,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
              */
             cancelEditor();
         }
-        for (LegacyField<?> editor : getEditorFields()) {
+        for (Field<?> editor : getEditorFields()) {
             editor.setParent(null);
         }
 
@@ -6909,8 +6912,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
      *
      * @return a collection of all the fields bound to the item editor
      */
-    Collection<LegacyField<?>> getEditorFields() {
-        Collection<LegacyField<?>> fields = editorFieldGroup.getFields();
+    Collection<Field<?>> getEditorFields() {
+        Collection<Field<?>> fields = editorFieldGroup.getFields();
         assert allAttached(fields);
         return fields;
     }
@@ -7264,7 +7267,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier,
         super.writeDesign(design, context);
 
         Attributes attrs = design.attributes();
-        LegacyGrid def = context.getDefaultInstance(this);
+        Grid def = context.getDefaultInstance(this);
 
         DesignAttributeHandler.writeAttribute("editable", attrs,
                 isEditorEnabled(), def.isEditorEnabled(), boolean.class);
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyInlineDateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/InlineDateField.java
index 4e1ad7e997..1bec2bc61e 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyInlineDateField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/InlineDateField.java
@@ -18,7 +18,7 @@ package com.vaadin.v7.ui;
 
 import java.util.Date;
 
-import com.vaadin.data.Property;
+import com.vaadin.v7.data.Property;
 
 /**
  * <p>
@@ -26,31 +26,31 @@ import com.vaadin.data.Property;
  *
  * </p>
  *
- * @see LegacyDateField
- * @see LegacyPopupDateField
+ * @see DateField
+ * @see PopupDateField
  * @author Vaadin Ltd.
  * @since 5.0
  */
-public class LegacyInlineDateField extends LegacyDateField {
+public class InlineDateField extends DateField {
 
-    public LegacyInlineDateField() {
+    public InlineDateField() {
         super();
     }
 
-    public LegacyInlineDateField(Property dataSource)
+    public InlineDateField(Property dataSource)
             throws IllegalArgumentException {
         super(dataSource);
     }
 
-    public LegacyInlineDateField(String caption, Date value) {
+    public InlineDateField(String caption, Date value) {
         super(caption, value);
     }
 
-    public LegacyInlineDateField(String caption, Property dataSource) {
+    public InlineDateField(String caption, Property dataSource) {
         super(caption, dataSource);
     }
 
-    public LegacyInlineDateField(String caption) {
+    public InlineDateField(String caption) {
         super(caption);
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ListSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ListSelect.java
index 9a720d1895..3b5683f55d 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/ListSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ListSelect.java
@@ -14,13 +14,13 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collection;
 
-import com.vaadin.data.Container;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
+import com.vaadin.v7.data.Container;
 
 /**
  * This is a simple list select without, for instance, support for new items,
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/NativeSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/NativeSelect.java
index 13556a0387..d68f184d43 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/NativeSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/NativeSelect.java
@@ -14,17 +14,17 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collection;
 
-import com.vaadin.data.Container;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcImpl;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
+import com.vaadin.v7.data.Container;
 
 /**
  * This is a simple drop-down select without, for instance, support for
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/OptionGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java
index 3e491906d5..f4e3415cf5 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/OptionGroup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -23,7 +23,6 @@ import java.util.Set;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Container;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;
@@ -35,6 +34,7 @@ import com.vaadin.shared.ui.optiongroup.OptionGroupConstants;
 import com.vaadin.shared.ui.optiongroup.OptionGroupState;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignFormatter;
+import com.vaadin.v7.data.Container;
 
 /**
  * Configures select to be used as an option group.
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyPopupDateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/PopupDateField.java
index c2470daf26..1ae0f79b30 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyPopupDateField.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/PopupDateField.java
@@ -18,10 +18,10 @@ package com.vaadin.v7.ui;
 
 import java.util.Date;
 
-import com.vaadin.data.Property;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.datefield.PopupDateFieldState;
+import com.vaadin.v7.data.Property;
 
 /**
  * <p>
@@ -29,33 +29,33 @@ import com.vaadin.shared.ui.datefield.PopupDateFieldState;
  *
  * </p>
  *
- * @see LegacyDateField
- * @see LegacyInlineDateField
+ * @see DateField
+ * @see InlineDateField
  * @author Vaadin Ltd.
  * @since 5.0
  */
-public class LegacyPopupDateField extends LegacyDateField {
+public class PopupDateField extends DateField {
 
     private String inputPrompt = null;
 
-    public LegacyPopupDateField() {
+    public PopupDateField() {
         super();
     }
 
-    public LegacyPopupDateField(Property dataSource)
+    public PopupDateField(Property dataSource)
             throws IllegalArgumentException {
         super(dataSource);
     }
 
-    public LegacyPopupDateField(String caption, Date value) {
+    public PopupDateField(String caption, Date value) {
         super(caption, value);
     }
 
-    public LegacyPopupDateField(String caption, Property dataSource) {
+    public PopupDateField(String caption, Property dataSource) {
         super(caption, dataSource);
     }
 
-    public LegacyPopupDateField(String caption) {
+    public PopupDateField(String caption) {
         super(caption);
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/RichTextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java
index e52db6d043..e7a790a2cc 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/RichTextArea.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java
@@ -14,28 +14,27 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Map;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Property;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.textarea.RichTextAreaState;
+import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignContext;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property;
 
 /**
  * A simple RichTextArea to edit HTML format text.
  *
- * Note, that using {@link LegacyTextField#setMaxLength(int)} method in
+ * Note, that using {@link TextField#setMaxLength(int)} method in
  * {@link RichTextArea} may produce unexpected results as formatting is counted
  * into length of field.
  */
-public class RichTextArea extends LegacyAbstractField<String>
+public class RichTextArea extends AbstractField<String>
         implements LegacyComponent {
 
     /**
@@ -213,7 +212,7 @@ public class RichTextArea extends LegacyAbstractField<String>
      * </p>
      *
      * @return the String Textual representation for null strings.
-     * @see LegacyTextField#isNullSettingAllowed()
+     * @see TextField#isNullSettingAllowed()
      */
     public String getNullRepresentation() {
         return nullRepresentation;
@@ -237,7 +236,7 @@ public class RichTextArea extends LegacyAbstractField<String>
      *
      * @return boolean Should the null-string represenation be always converted
      *         to null-values.
-     * @see LegacyTextField#getNullRepresentation()
+     * @see TextField#getNullRepresentation()
      */
     public boolean isNullSettingAllowed() {
         return nullSettingAllowed;
@@ -258,7 +257,7 @@ public class RichTextArea extends LegacyAbstractField<String>
      *
      * @param nullRepresentation
      *            Textual representation for null strings.
-     * @see LegacyTextField#setNullSettingAllowed(boolean)
+     * @see TextField#setNullSettingAllowed(boolean)
      */
     public void setNullRepresentation(String nullRepresentation) {
         this.nullRepresentation = nullRepresentation;
@@ -283,7 +282,7 @@ public class RichTextArea extends LegacyAbstractField<String>
      * @param nullSettingAllowed
      *            Should the null-string represenation be always converted to
      *            null-values.
-     * @see LegacyTextField#getNullRepresentation()
+     * @see TextField#getNullRepresentation()
      */
     public void setNullSettingAllowed(boolean nullSettingAllowed) {
         this.nullSettingAllowed = nullSettingAllowed;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Select.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Select.java
index 66b36f8ac2..2710287445 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/Select.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Select.java
@@ -14,17 +14,17 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collection;
 
-import com.vaadin.data.Container;
+import com.vaadin.v7.data.Container;
 
 /**
  * <p>
  * A class representing a selection of items the user has selected in a UI. The
- * set of choices is presented as a set of {@link com.vaadin.data.Item}s in a
- * {@link com.vaadin.data.Container}.
+ * set of choices is presented as a set of {@link com.vaadin.v7.data.Item}s in a
+ * {@link com.vaadin.v7.data.Container}.
  * </p>
  *
  * <p>
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
index 13333146f2..760940a482 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/Table.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -37,11 +37,6 @@ import java.util.logging.Logger;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.ContainerOrderedWrapper;
-import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ContextClickEvent;
@@ -69,14 +64,22 @@ import com.vaadin.shared.ui.table.TableConstants.Section;
 import com.vaadin.shared.ui.table.TableServerRpc;
 import com.vaadin.shared.ui.table.TableState;
 import com.vaadin.shared.util.SharedUtil;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.HasChildMeasurementHint;
+import com.vaadin.ui.HasComponents;
+import com.vaadin.ui.UniqueSerializable;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
 import com.vaadin.ui.declarative.DesignFormatter;
 import com.vaadin.util.ReflectTools;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.ContainerOrderedWrapper;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.util.converter.ConverterUtil;
 
 /**
  * <p>
@@ -582,11 +585,11 @@ public class Table extends AbstractSelect implements Action.Container,
 
     private RowGenerator rowGenerator = null;
 
-    private final Map<LegacyField<?>, Property<?>> associatedProperties = new HashMap<LegacyField<?>, Property<?>>();
+    private final Map<Field<?>, Property<?>> associatedProperties = new HashMap<Field<?>, Property<?>>();
 
     private boolean painted = false;
 
-    private HashMap<Object, LegacyConverter<String, Object>> propertyValueConverters = new HashMap<Object, LegacyConverter<String, Object>>();
+    private HashMap<Object, Converter<String, Object>> propertyValueConverters = new HashMap<Object, Converter<String, Object>>();
 
     /**
      * Set to true if the client-side should be informed that the key mapper has
@@ -2552,8 +2555,8 @@ public class Table extends AbstractSelect implements Action.Container,
          * Also remove property data sources to unregister listeners keeping the
          * fields in memory.
          */
-        if (component instanceof LegacyField) {
-            LegacyField<?> field = (LegacyField<?>) component;
+        if (component instanceof Field) {
+            Field<?> field = (Field<?>) component;
             Property<?> associatedProperty = associatedProperties
                     .remove(component);
             if (associatedProperty != null
@@ -2777,7 +2780,7 @@ public class Table extends AbstractSelect implements Action.Container,
                     .getContainerPropertyIds();
             LinkedList<Object> retainableValueConverters = new LinkedList<Object>();
             for (Object propertyId : newPropertyIds) {
-                LegacyConverter<String, ?> converter = getConverter(propertyId);
+                Converter<String, ?> converter = getConverter(propertyId);
                 if (converter != null) {
                     if (typeIsCompatible(converter.getModelType(),
                             newDataSource.getType(propertyId))) {
@@ -2941,7 +2944,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Invoked when the value of a variable has changed.
      *
-     * @see com.vaadin.ui.Select#changeVariables(java.lang.Object,
+     * @see com.vaadin.v7.ui.Select#changeVariables(java.lang.Object,
      *      java.util.Map)
      */
 
@@ -4105,7 +4108,7 @@ public class Table extends AbstractSelect implements Action.Container,
     protected Object getPropertyValue(Object rowId, Object colId,
             Property property) {
         if (isEditable() && fieldFactory != null) {
-            final LegacyField<?> f = fieldFactory
+            final Field<?> f = fieldFactory
                     .createField(getContainerDataSource(), rowId, colId, this);
             if (f != null) {
                 // Remember that we have made this association so we can remove
@@ -4132,7 +4135,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @since 6.7.3
      */
     protected void bindPropertyToField(Object rowId, Object colId,
-            Property property, LegacyField field) {
+            Property property, Field field) {
         // check if field has a property that is Viewer set. In that case we
         // expect developer has e.g. PropertyFormatter that he wishes to use and
         // assign the property to the Viewer instead.
@@ -4164,12 +4167,12 @@ public class Table extends AbstractSelect implements Action.Container,
         if (property == null) {
             return "";
         }
-        LegacyConverter<String, Object> converter = null;
+        Converter<String, Object> converter = null;
 
         if (hasConverter(colId)) {
             converter = getConverter(colId);
         } else {
-            converter = (LegacyConverter) LegacyConverterUtil.getConverter(
+            converter = (Converter) ConverterUtil.getConverter(
                     String.class, property.getType(), getSession());
         }
         Object value = property.getValue();
@@ -4254,7 +4257,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *
      * Also listens changes in rendered items to refresh content area.
      *
-     * @see com.vaadin.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
+     * @see com.vaadin.v7.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent)
      */
 
     @Override
@@ -4309,7 +4312,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Removes all Items from the Container.
      *
-     * @see com.vaadin.data.Container#removeAllItems()
+     * @see com.vaadin.v7.data.Container#removeAllItems()
      */
 
     @Override
@@ -4322,7 +4325,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Removes the Item identified by <code>ItemId</code> from the Container.
      *
-     * @see com.vaadin.data.Container#removeItem(Object)
+     * @see com.vaadin.v7.data.Container#removeItem(Object)
      */
 
     @Override
@@ -4342,7 +4345,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Removes a Property specified by the given Property ID from the Container.
      *
-     * @see com.vaadin.data.Container#removeContainerProperty(Object)
+     * @see com.vaadin.v7.data.Container#removeContainerProperty(Object)
      */
 
     @Override
@@ -4370,7 +4373,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *            the class of the property.
      * @param defaultValue
      *            the default value given for all existing items.
-     * @see com.vaadin.data.Container#addContainerProperty(Object, Class,
+     * @see com.vaadin.v7.data.Container#addContainerProperty(Object, Class,
      *      Object)
      */
 
@@ -4415,7 +4418,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *            the Alignment of the column. Null implies align left.
      * @throws UnsupportedOperationException
      *             if the operation is not supported.
-     * @see com.vaadin.data.Container#addContainerProperty(Object, Class,
+     * @see com.vaadin.v7.data.Container#addContainerProperty(Object, Class,
      *      Object)
      */
     public boolean addContainerProperty(Object propertyId, Class<?> type,
@@ -4527,7 +4530,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * {@link #getPageLength()} may produce good enough estimates in some
      * situations.
      *
-     * @see com.vaadin.ui.Select#getVisibleItemIds()
+     * @see com.vaadin.v7.ui.Select#getVisibleItemIds()
      */
 
     @Override
@@ -4551,7 +4554,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Container datasource item set change. Table must flush its buffers on
      * change.
      *
-     * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent)
+     * @see com.vaadin.v7.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.v7.data.Container.ItemSetChangeEvent)
      */
 
     @Override
@@ -4597,7 +4600,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Container datasource property set change. Table must flush its buffers on
      * change.
      *
-     * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent)
+     * @see com.vaadin.v7.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.v7.data.Container.PropertySetChangeEvent)
      */
 
     @Override
@@ -4645,7 +4648,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *
      * @throws UnsupportedOperationException
      *             if set to true.
-     * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean)
+     * @see com.vaadin.v7.ui.Select#setNewItemsAllowed(boolean)
      */
 
     @Override
@@ -4659,7 +4662,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the ID of the Item following the Item that corresponds to itemId.
      *
-     * @see com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object)
+     * @see com.vaadin.v7.data.Container.Ordered#nextItemId(java.lang.Object)
      */
 
     @Override
@@ -4671,7 +4674,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Gets the ID of the Item preceding the Item that corresponds to the
      * itemId.
      *
-     * @see com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object)
+     * @see com.vaadin.v7.data.Container.Ordered#prevItemId(java.lang.Object)
      */
 
     @Override
@@ -4682,7 +4685,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the ID of the first Item in the Container.
      *
-     * @see com.vaadin.data.Container.Ordered#firstItemId()
+     * @see com.vaadin.v7.data.Container.Ordered#firstItemId()
      */
 
     @Override
@@ -4693,7 +4696,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Gets the ID of the last Item in the Container.
      *
-     * @see com.vaadin.data.Container.Ordered#lastItemId()
+     * @see com.vaadin.v7.data.Container.Ordered#lastItemId()
      */
 
     @Override
@@ -4705,7 +4708,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Tests if the Item corresponding to the given Item ID is the first Item in
      * the Container.
      *
-     * @see com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object)
+     * @see com.vaadin.v7.data.Container.Ordered#isFirstId(java.lang.Object)
      */
 
     @Override
@@ -4717,7 +4720,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * Tests if the Item corresponding to the given Item ID is the last Item in
      * the Container.
      *
-     * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object)
+     * @see com.vaadin.v7.data.Container.Ordered#isLastId(java.lang.Object)
      */
 
     @Override
@@ -4728,7 +4731,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Adds new item after the given item.
      *
-     * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object)
+     * @see com.vaadin.v7.data.Container.Ordered#addItemAfter(java.lang.Object)
      */
 
     @Override
@@ -4745,7 +4748,7 @@ public class Table extends AbstractSelect implements Action.Container,
     /**
      * Adds new item after the given item.
      *
-     * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object,
+     * @see com.vaadin.v7.data.Container.Ordered#addItemAfter(java.lang.Object,
      *      java.lang.Object)
      */
 
@@ -4801,7 +4804,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * property to true.
      *
      * @return true if table is editable, false otherwise.
-     * @see LegacyField
+     * @see Field
      * @see FieldFactory
      *
      */
@@ -4821,7 +4824,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *
      * @param editable
      *            true if table should be editable by user.
-     * @see LegacyField
+     * @see Field
      * @see FieldFactory
      *
      */
@@ -4838,7 +4841,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @throws UnsupportedOperationException
      *             if the container data source does not implement
      *             Container.Sortable
-     * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[],
+     * @see com.vaadin.v7.data.Container.Sortable#sort(java.lang.Object[],
      *      boolean[])
      *
      */
@@ -4893,7 +4896,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * collection.
      * </p>
      *
-     * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds()
+     * @see com.vaadin.v7.data.Container.Sortable#getSortableContainerPropertyIds()
      */
 
     @Override
@@ -6077,7 +6080,7 @@ public class Table extends AbstractSelect implements Action.Container,
      *            The converter to use for the property id
      */
     public void setConverter(Object propertyId,
-            LegacyConverter<String, ?> converter) {
+            Converter<String, ?> converter) {
         if (!getContainerPropertyIds().contains(propertyId)) {
             throw new IllegalArgumentException(
                     "PropertyId " + propertyId + " must be in the container");
@@ -6090,7 +6093,7 @@ public class Table extends AbstractSelect implements Action.Container,
                             + converter.getModelType() + ")");
         }
         propertyValueConverters.put(propertyId,
-                (LegacyConverter<String, Object>) converter);
+                (Converter<String, Object>) converter);
         refreshRowCache();
     }
 
@@ -6114,7 +6117,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * @return The converter used to format the propertyId or null if no
      *         converter has been set
      */
-    public LegacyConverter<String, Object> getConverter(Object propertyId) {
+    public Converter<String, Object> getConverter(Object propertyId) {
         return propertyValueConverters.get(propertyId);
     }
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TableFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java
index 54f8bc5110..1ed286738d 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/TableFieldFactory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 
-import com.vaadin.data.Container;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.ui.Component;
+import com.vaadin.v7.data.Container;
 
 /**
  * Factory interface for creating new LegacyField-instances based on Container
  * (datasource), item id, property id and uiContext (the component responsible
  * for displaying fields). Currently this interface is used by {@link Table},
- * but might later be used by some other components for {@link LegacyField}
+ * but might later be used by some other components for {@link Field}
  * generation.
  *
  * <p>
@@ -50,7 +50,7 @@ public interface TableFieldFactory extends Serializable {
      * @return A field suitable for editing the specified data or null if the
      *         property should not be editable.
      */
-    LegacyField<?> createField(Container container, Object itemId,
+    Field<?> createField(Container container, Object itemId,
             Object propertyId, Component uiContext);
 
 }
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
index 056667a696..e4cd20a59b 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/TextArea.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java
@@ -14,20 +14,19 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Property;
 import com.vaadin.shared.ui.textarea.TextAreaState;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignFormatter;
-import com.vaadin.v7.ui.LegacyAbstractTextField;
+import com.vaadin.v7.data.Property;
 
 /**
  * A text field that supports multi line editing.
  */
-public class TextArea extends LegacyAbstractTextField {
+public class TextArea extends AbstractTextField {
 
     /**
      * Constructs an empty TextArea.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
index 5da499f94e..83f805ffb4 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/Tree.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -32,10 +32,6 @@ import java.util.StringTokenizer;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
-import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ContextClickEvent;
@@ -62,10 +58,15 @@ import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.shared.ui.tree.TreeConstants;
 import com.vaadin.shared.ui.tree.TreeServerRpc;
 import com.vaadin.shared.ui.tree.TreeState;
+import com.vaadin.ui.Component;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
 import com.vaadin.util.ReflectTools;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.v7.data.util.HierarchicalContainer;
 
 /**
  * Tree component. A Tree can be used to select an item (or multiple items) from
@@ -857,7 +858,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tests if the Item with given ID can have any children.
      *
-     * @see com.vaadin.data.Container.Hierarchical#areChildrenAllowed(Object)
+     * @see com.vaadin.v7.data.Container.Hierarchical#areChildrenAllowed(Object)
      */
     @Override
     public boolean areChildrenAllowed(Object itemId) {
@@ -867,7 +868,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the IDs of all Items that are children of the specified Item.
      *
-     * @see com.vaadin.data.Container.Hierarchical#getChildren(Object)
+     * @see com.vaadin.v7.data.Container.Hierarchical#getChildren(Object)
      */
     @Override
     public Collection<?> getChildren(Object itemId) {
@@ -877,7 +878,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the ID of the parent Item of the specified Item.
      *
-     * @see com.vaadin.data.Container.Hierarchical#getParent(Object)
+     * @see com.vaadin.v7.data.Container.Hierarchical#getParent(Object)
      */
     @Override
     public Object getParent(Object itemId) {
@@ -887,7 +888,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tests if the Item specified with <code>itemId</code> has child Items.
      *
-     * @see com.vaadin.data.Container.Hierarchical#hasChildren(Object)
+     * @see com.vaadin.v7.data.Container.Hierarchical#hasChildren(Object)
      */
     @Override
     public boolean hasChildren(Object itemId) {
@@ -897,7 +898,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tests if the Item specified with <code>itemId</code> is a root Item.
      *
-     * @see com.vaadin.data.Container.Hierarchical#isRoot(Object)
+     * @see com.vaadin.v7.data.Container.Hierarchical#isRoot(Object)
      */
     @Override
     public boolean isRoot(Object itemId) {
@@ -907,7 +908,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the IDs of all Items in the container that don't have a parent.
      *
-     * @see com.vaadin.data.Container.Hierarchical#rootItemIds()
+     * @see com.vaadin.v7.data.Container.Hierarchical#rootItemIds()
      */
     @Override
     public Collection<?> rootItemIds() {
@@ -917,7 +918,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Sets the given Item's capability to have children.
      *
-     * @see com.vaadin.data.Container.Hierarchical#setChildrenAllowed(Object,
+     * @see com.vaadin.v7.data.Container.Hierarchical#setChildrenAllowed(Object,
      *      boolean)
      */
     @Override
@@ -952,7 +953,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Sets the Container that serves as the data source of the viewer.
      *
-     * @see com.vaadin.data.Container.Viewer#setContainerDataSource(Container)
+     * @see com.vaadin.v7.data.Container.Viewer#setContainerDataSource(Container)
      */
     @Override
     public void setContainerDataSource(Container newDataSource) {
@@ -988,7 +989,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
 
     @Override
     public void containerItemSetChange(
-            com.vaadin.data.Container.ItemSetChangeEvent event) {
+            com.vaadin.v7.data.Container.ItemSetChangeEvent event) {
         super.containerItemSetChange(event);
         if (getContainerDataSource() instanceof Filterable) {
             boolean hasFilters = !((Filterable) getContainerDataSource())
@@ -1283,7 +1284,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Gets the visible item ids.
      *
-     * @see com.vaadin.ui.Select#getVisibleItemIds()
+     * @see com.vaadin.v7.ui.Select#getVisibleItemIds()
      */
     @Override
     public Collection<?> getVisibleItemIds() {
@@ -1327,7 +1328,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
     /**
      * Tree does not support <code>setNullSelectionItemId</code>.
      *
-     * @see com.vaadin.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object)
+     * @see com.vaadin.v7.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object)
      */
     @Override
     public void setNullSelectionItemId(Object nullSelectionItemId)
@@ -1343,7 +1344,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
      *
      * @throws UnsupportedOperationException
      *             if set to true.
-     * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean)
+     * @see com.vaadin.v7.ui.Select#setNewItemsAllowed(boolean)
      */
     @Override
     public void setNewItemsAllowed(boolean allowNewOptions)
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TreeTable.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
index 2e69a0071d..446c9c271c 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/TreeTable.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -30,25 +30,25 @@ import java.util.logging.Logger;
 
 import org.jsoup.nodes.Element;
 
-import com.vaadin.data.Collapsible;
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Hierarchical;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
-import com.vaadin.data.util.HierarchicalContainer;
-import com.vaadin.data.util.HierarchicalContainerOrderedWrapper;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.server.Resource;
 import com.vaadin.shared.ui.treetable.TreeTableConstants;
 import com.vaadin.shared.ui.treetable.TreeTableState;
-import com.vaadin.ui.Tree.CollapseEvent;
-import com.vaadin.ui.Tree.CollapseListener;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.Tree.ExpandListener;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
+import com.vaadin.v7.data.Collapsible;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Hierarchical;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.data.util.HierarchicalContainerOrderedWrapper;
+import com.vaadin.v7.ui.Tree.CollapseEvent;
+import com.vaadin.v7.ui.Tree.CollapseListener;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.Tree.ExpandListener;
 
 /**
  * TreeTable extends the {@link Table} component so that it can also visualize a
@@ -624,7 +624,7 @@ public class TreeTable extends Table implements Hierarchical {
 
     @Override
     public void containerItemSetChange(
-            com.vaadin.data.Container.ItemSetChangeEvent event) {
+            com.vaadin.v7.data.Container.ItemSetChangeEvent event) {
         // Can't do partial repaints if items are added or removed during the
         // expand/collapse request
         toggledItemId = null;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TwinColSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java
index 261d813ffa..68853ddaa1 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/TwinColSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java
@@ -14,15 +14,15 @@
  * the License.
  */
 
-package com.vaadin.ui;
+package com.vaadin.v7.ui;
 
 import java.util.Collection;
 
-import com.vaadin.data.Container;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants;
 import com.vaadin.shared.ui.twincolselect.TwinColSelectState;
+import com.vaadin.v7.data.Container;
 
 /**
  * Multiselect component with two lists: left side for available items and right
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java
index f007f0cf34..230d87b7f7 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar;
+package com.vaadin.v7.ui.components.calendar;
 
-import com.vaadin.ui.Calendar;
 import com.vaadin.ui.Component;
+import com.vaadin.v7.ui.Calendar;
 
 /**
  * All Calendar events extends this class.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java
index 2c4fec95d4..14494eedbe 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar;
+package com.vaadin.v7.ui.components.calendar;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -21,9 +21,9 @@ import java.util.Date;
 import java.util.EventListener;
 
 import com.vaadin.shared.ui.calendar.CalendarEventId;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
 import com.vaadin.util.ReflectTools;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
 
 /**
  * Interface for all Vaadin Calendar events.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java
index 09d6c80a7f..69a4123c1b 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar;
+package com.vaadin.v7.ui.components.calendar;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java
index 3b71ab5a00..f9f4100e53 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar;
+package com.vaadin.v7.ui.components.calendar;
 
 import java.util.Date;
 import java.util.Map;
 
 import com.vaadin.event.dd.DropTarget;
 import com.vaadin.event.dd.TargetDetailsImpl;
-import com.vaadin.ui.Calendar;
+import com.vaadin.v7.ui.Calendar;
 
 /**
- * Drop details for {@link com.vaadin.ui.addon.calendar.ui.Calendar Calendar}.
+ * Drop details for {@link com.vaadin.v7.ui.addon.calendar.ui.Calendar Calendar}.
  * When something is dropped on the Calendar, this class contains the specific
  * details of the drop point. Specifically, this class gives access to the date
  * where the drop happened. If the Calendar was in weekly mode, the date also
@@ -71,7 +71,7 @@ public class CalendarTargetDetails extends TargetDetailsImpl {
     }
 
     /**
-     * @return the {@link com.vaadin.ui.addon.calendar.ui.Calendar Calendar}
+     * @return the {@link com.vaadin.v7.ui.addon.calendar.ui.Calendar Calendar}
      *         instance which was the target of the drop
      */
     public Calendar getTargetCalendar() {
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java
index b0a6aaa95a..961b2d8fec 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java
@@ -13,32 +13,32 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar;
+package com.vaadin.v7.ui.components.calendar;
 
 import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeNotifier;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeNotifier;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResize;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.MoveEvent;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEditableEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeListener;
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeNotifier;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeNotifier;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeNotifier;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResize;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.MoveEvent;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEditableEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeListener;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeNotifier;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier;
 
 /**
  * A event provider which uses a {@link Container} as a datasource. Container
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java
index e2a580085a..f1b6524d2c 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeNotifier;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeNotifier;
 
 /**
  * Simple implementation of {@link com.vaadin.addon.calendar.event.CalendarEvent
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java
index fbf197d3eb..59c8baca9c 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier;
 
 /**
  * <p>
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEditableEventProvider.java
index aaa76418a6..90f8992720 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEditableEventProvider.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 /**
  * An event provider which allows adding and removing events
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEvent.java
index b4195cf0b1..9aaa1cd5ba 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEventProvider.java
index 1d4fabed5a..bef6aaea18 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEventProvider.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/EditableCalendarEvent.java
index 5a44cae4ac..cb3553ec87 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/EditableCalendarEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.event;
+package com.vaadin.v7.ui.components.calendar.event;
 
 import java.util.Date;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
index 61f738fcd0..956db6b179 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Calendar;
 import java.util.Date;
 
 import com.vaadin.shared.ui.calendar.DateConstants;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardHandler;
 
 /**
  * Implements basic functionality needed to enable backwards navigation.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicDateClickHandler.java
index 0107e10e3d..381acb6b1d 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicDateClickHandler.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Calendar;
 import java.util.Date;
 
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
 
 /**
  * Implements basic functionality needed to switch to day view when a single day
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventMoveHandler.java
index 60f0016312..be27b606fe 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventMoveHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Date;
 
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.MoveEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.EditableCalendarEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.MoveEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.EditableCalendarEvent;
 
 /**
  * Implements basic functionality needed to enable moving events.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventResizeHandler.java
index 51e4bc1cbc..9b6f08ff09 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventResizeHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Date;
 
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResize;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.EditableCalendarEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResize;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.EditableCalendarEvent;
 
 /**
  * Implements basic functionality needed to enable event resizing.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
index 6cdc00bee2..d71958536e 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Calendar;
 import java.util.Date;
 
 import com.vaadin.shared.ui.calendar.DateConstants;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
 
 /**
  * Implements basic functionality needed to enable forward navigation.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicWeekClickHandler.java
index 128c6abfbd..420d0a76f6 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicWeekClickHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.calendar.handler;
+package com.vaadin.v7.ui.components.calendar.handler;
 
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
 
 /**
  * Implements basic functionality needed to change to week view when a week
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeEvent.java
index aa703deb19..da0b435ddc 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import com.vaadin.shared.ui.colorpicker.Color;
 import com.vaadin.ui.Component;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeListener.java
index b234dc3d5d..87f0046242 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGradient.java
index 23748a967a..cb9dd698d9 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGradient.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.lang.reflect.Method;
 
 import com.vaadin.shared.ui.colorpicker.Color;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGradientServerRpc;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGradientState;
-import com.vaadin.ui.AbstractColorPicker.Coordinates2Color;
 import com.vaadin.ui.AbstractComponent;
+import com.vaadin.v7.ui.AbstractColorPicker.Coordinates2Color;
 
 /**
  * A component that represents a color gradient within a color picker.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java
index 9e5580c719..a1286dbc58 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.awt.Point;
 import java.lang.reflect.Method;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java
index 1173faf152..e26e802a32 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java
index dbf3b18bf3..39931ce570 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -27,7 +27,6 @@ import java.util.logging.Logger;
 
 import com.vaadin.shared.ui.MarginInfo;
 import com.vaadin.shared.ui.colorpicker.Color;
-import com.vaadin.ui.AbstractColorPicker.Coordinates2Color;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -40,6 +39,7 @@ import com.vaadin.ui.Slider.ValueOutOfBoundsException;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.AbstractColorPicker.Coordinates2Color;
 
 /**
  * A component that represents color selection popup within a color picker.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPreview.java
index dc133ce156..2a5b7c456f 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPreview.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.lang.reflect.Method;
 
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.shared.ui.colorpicker.Color;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextField;
 
 /**
  * A component that represents color selection preview within a color picker.
@@ -51,7 +51,7 @@ public class ColorPickerPreview extends CssLayout
     private Color color;
 
     /** The field. */
-    private final LegacyTextField field;
+    private final TextField field;
 
     /** The old value. */
     private String oldValue;
@@ -59,7 +59,7 @@ public class ColorPickerPreview extends CssLayout
     private ColorPickerPreview() {
         setStyleName("v-colorpicker-preview");
         setImmediate(true);
-        field = new LegacyTextField();
+        field = new TextField();
         field.setImmediate(true);
         field.setSizeFull();
         field.setStyleName("v-colorpicker-preview-textfield");
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerSelect.java
index ae3dee4069..87156b34db 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerSelect.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.shared.ui.colorpicker.Color;
-import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
 
 /**
  * A component that represents color selection swatches within a color picker.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorSelector.java
index d9264745a8..a4da97c46b 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorSelector.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/HasColorChangeListener.java
index 7980111e2b..ed416c1ebe 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/HasColorChangeListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.components.colorpicker;
+package com.vaadin.v7.ui.components.colorpicker;
 
 import java.io.Serializable;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/AbstractJavaScriptRenderer.java
index ac9ffb0eeb..2d0ac7f62e 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/AbstractJavaScriptRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import com.vaadin.server.AbstractJavaScriptExtension;
 import com.vaadin.server.JavaScriptCallbackHelper;
@@ -21,7 +21,7 @@ import com.vaadin.server.JsonCodec;
 import com.vaadin.shared.JavaScriptExtensionState;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.ui.JavaScriptFunction;
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 import elemental.json.Json;
 import elemental.json.JsonValue;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ButtonRenderer.java
index 3d7d5ab9d2..906fc025bb 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ButtonRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 /**
  * A Renderer that displays a button with a textual caption. The value of the
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ClickableRenderer.java
index d8fcdc3b4e..a1f48a99c4 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ClickableRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import java.lang.reflect.Method;
 
@@ -21,10 +21,10 @@ import com.vaadin.event.ConnectorEventListener;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.grid.renderers.RendererClickRpc;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
-import com.vaadin.ui.LegacyGrid.Column;
 import com.vaadin.util.ReflectTools;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.Column;
 
 /**
  * An abstract superclass for Renderers that render clickable items. Click
@@ -67,7 +67,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> {
         private Object itemId;
         private Column column;
 
-        protected RendererClickEvent(LegacyGrid source, Object itemId, Column column,
+        protected RendererClickEvent(Grid source, Object itemId, Column column,
                 MouseEventDetails mouseEventDetails) {
             super(source, mouseEventDetails);
             this.itemId = itemId;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/DateRenderer.java
index eea18e7445..ac3b831acc 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/DateRenderer.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 import elemental.json.JsonValue;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/HtmlRenderer.java
index 85d7801c41..5264f19e0b 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/HtmlRenderer.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 /**
  * A renderer for presenting HTML content.
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ImageRenderer.java
index 56e319b47d..19c7a77b01 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ImageRenderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.Resource;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java
index e54eecc6ef..061f6d5790 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import java.text.NumberFormat;
 import java.util.Locale;
 
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 import elemental.json.JsonValue;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ProgressBarRenderer.java
index fe90dfdee0..d19c09ec59 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ProgressBarRenderer.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 import elemental.json.JsonValue;
 
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/Renderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/Renderer.java
index d42e299ea8..ce221760cc 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/Renderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/Renderer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
 import com.vaadin.server.ClientConnector;
 import com.vaadin.server.Extension;
diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/TextRenderer.java
index 799e67b9e7..23306baf75 100644
--- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/TextRenderer.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.renderers;
+package com.vaadin.v7.ui.renderers;
 
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
 
 /**
  * A renderer for presenting simple plain-text string values.