diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/DbProxyTest.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/DbProxyTest.java
similarity index 94%
rename from rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/DbProxyTest.java
rename to rapidoid-db-tests/src/test/java/org/rapidoid/db/DbProxyTest.java
index 8d04f3118f..5a72affcad 100644
--- a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/DbProxyTest.java
+++ b/rapidoid-db-tests/src/test/java/org/rapidoid/db/DbProxyTest.java
@@ -1,9 +1,8 @@
-package org.rapidoid.db.entity;
+package org.rapidoid.db;
 
 import java.util.concurrent.ConcurrentMap;
 
-import org.rapidoid.db.DB;
-import org.rapidoid.db.DbTestCommons;
+import org.rapidoid.db.imodel.Task;
 import org.rapidoid.db.impl.DbProxy;
 import org.rapidoid.util.U;
 import org.testng.annotations.Test;
@@ -41,7 +40,7 @@ public void testDbProxy() {
 
 		final Task t = DbProxy.create(Task.class, map);
 		notNull(t);
-		
+
 		U.benchmarkMT(100, "ops", 1000000, new Runnable() {
 			@Override
 			public void run() {
diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Comment.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Comment.java
similarity index 93%
rename from rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Comment.java
rename to rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Comment.java
index d0ebdf810d..e24bd21b1c 100644
--- a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Comment.java
+++ b/rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Comment.java
@@ -1,4 +1,4 @@
-package org.rapidoid.db.entity;
+package org.rapidoid.db.imodel;
 
 import org.rapidoid.annotation.Relation;
 import org.rapidoid.db.DbColumn;
@@ -26,7 +26,7 @@
  * #L%
  */
 
-interface Comment extends Entity {
+public interface Comment extends Entity {
 
 	DbColumn<String> content();
 
diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Commentable.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Commentable.java
similarity index 96%
rename from rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Commentable.java
rename to rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Commentable.java
index 4c0373819c..cee41fd298 100644
--- a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Commentable.java
+++ b/rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Commentable.java
@@ -1,4 +1,4 @@
-package org.rapidoid.db.entity;
+package org.rapidoid.db.imodel;
 
 /*
  * #%L
diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Priority.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Priority.java
similarity index 95%
rename from rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Priority.java
rename to rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Priority.java
index f54441f19a..8e86d0874d 100644
--- a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Priority.java
+++ b/rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Priority.java
@@ -1,4 +1,4 @@
-package org.rapidoid.db.entity;
+package org.rapidoid.db.imodel;
 
 /*
  * #%L
diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Task.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Task.java
similarity index 93%
rename from rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Task.java
rename to rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Task.java
index a053828d95..10a6430099 100644
--- a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/Task.java
+++ b/rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/Task.java
@@ -1,4 +1,4 @@
-package org.rapidoid.db.entity;
+package org.rapidoid.db.imodel;
 
 import org.rapidoid.annotation.Optional;
 import org.rapidoid.annotation.Relation;
@@ -29,7 +29,7 @@
  * #L%
  */
 
-interface Task extends Entity, Commentable {
+public interface Task extends Entity, Commentable {
 
 	DbDsl<Task> DSL = DB.dsl(Task.class);
 
diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/User.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/User.java
similarity index 94%
rename from rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/User.java
rename to rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/User.java
index edefbf9c66..71521098d8 100644
--- a/rapidoid-db-tests/src/test/java/org/rapidoid/db/entity/User.java
+++ b/rapidoid-db-tests/src/test/java/org/rapidoid/db/imodel/User.java
@@ -1,4 +1,4 @@
-package org.rapidoid.db.entity;
+package org.rapidoid.db.imodel;
 
 /*
  * #%L
@@ -29,7 +29,7 @@
 import org.rapidoid.db.DbSet;
 import org.rapidoid.db.Entity;
 
-interface User extends Entity {
+public interface User extends Entity {
 
 	DbDsl<User> DSL = DB.dsl(User.class);
 
diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/Company.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/Company.java
index c210e9265a..6cd8c713e6 100644
--- a/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/Company.java
+++ b/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/Company.java
@@ -1,5 +1,7 @@
 package org.rapidoid.db.model;
 
+import org.rapidoid.db.AbstractEntity;
+
 /*
  * #%L
  * rapidoid-db-tests
@@ -20,8 +22,11 @@
  * #L%
  */
 
-public class Company {
+@SuppressWarnings("serial")
+public class Company extends AbstractEntity {
+
 	public String name;
+
 	public Profile profile;
 
 	@Override
diff --git a/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/ICompany.java b/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/ICompany.java
new file mode 100644
index 0000000000..71e609c2c3
--- /dev/null
+++ b/rapidoid-db-tests/src/test/java/org/rapidoid/db/model/ICompany.java
@@ -0,0 +1,32 @@
+package org.rapidoid.db.model;
+
+import org.rapidoid.db.DbColumn;
+import org.rapidoid.db.Entity;
+
+/*
+ * #%L
+ * rapidoid-db-tests
+ * %%
+ * Copyright (C) 2014 - 2015 Nikolche Mihajlovski
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+public interface ICompany extends Entity {
+
+	DbColumn<String> name();
+
+	DbColumn<IProfile> profile();
+
+}