diff --git a/server/src/main/java/com/vaadin/v7/data/Buffered.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Buffered.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/Buffered.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/Buffered.java
diff --git a/server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java b/compatibility-server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java
diff --git a/server/src/main/java/com/vaadin/v7/data/Property.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Property.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/Property.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/Property.java
diff --git a/server/src/main/java/com/vaadin/v7/data/Validatable.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/Validatable.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/Validatable.java
diff --git a/server/src/main/java/com/vaadin/v7/data/Validator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/Validator.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/Validator.java
diff --git a/server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java
diff --git a/server/src/main/java/com/vaadin/v7/data/util/ListSet.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ListSet.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/util/ListSet.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/util/ListSet.java
diff --git a/server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java
diff --git a/server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java
diff --git a/server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java
diff --git a/server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java
diff --git a/server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java
diff --git a/server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java
diff --git a/server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java
diff --git a/server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java
diff --git a/server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java
similarity index 100%
rename from server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java
rename to compatibility-server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java
diff --git a/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java
similarity index 100%
rename from server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java
rename to compatibility-server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java
similarity index 100%
rename from server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java
rename to compatibility-server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java
index 3d6a6136dc5..9ffc8613733 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java
@@ -1,5 +1,7 @@
 package com.vaadin.tests.server.component.button;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -7,7 +9,6 @@
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.data.util.ObjectProperty;
 import com.vaadin.ui.UI;
 
 /**
@@ -19,17 +20,17 @@ public class ButtonClickTest {
     @Test
     public void clickDetachedButton() {
         Button b = new Button();
-        final ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0);
+        AtomicInteger counter = new AtomicInteger(0);
         b.addClickListener(new ClickListener() {
 
             @Override
             public void buttonClick(ClickEvent event) {
-                counter.setValue(counter.getValue() + 1);
+                counter.incrementAndGet();
             }
         });
 
         b.click();
-        Assert.assertEquals(Integer.valueOf(1), counter.getValue());
+        Assert.assertEquals(1, counter.get());
     }
 
     @Test