diff --git a/tests/com/idcanet/vasc/tests/SWTTest.java b/tests/com/idcanet/vasc/SWTTest.java
similarity index 98%
rename from tests/com/idcanet/vasc/tests/SWTTest.java
rename to tests/com/idcanet/vasc/SWTTest.java
index efe1613..f80033a 100644
--- a/tests/com/idcanet/vasc/tests/SWTTest.java
+++ b/tests/com/idcanet/vasc/SWTTest.java
@@ -24,7 +24,7 @@
  * should not be interpreted as representing official policies, either expressed or implied, of IDCA.
  */
 
-package com.idcanet.vasc.tests;
+package com.idcanet.vasc;
 
 import java.io.InputStream;
 import java.util.logging.LogManager;
@@ -48,7 +48,7 @@ import com.idcanet.vasc.impl.column.BeanPropertyVascColumnValue;
 import com.idcanet.vasc.impl.column.DefaultVascColumnEditor;
 import com.idcanet.vasc.impl.column.DefaultVascColumnRenderer;
 import com.idcanet.vasc.impl.swt.SwtVascViewRenderer;
-import com.idcanet.vasc.tests.models.TestModel;
+import com.idcanet.vasc.models.TestModel;
 import com.idcanet.xtes.core.TemplateStore;
 import com.idcanet.xtes.core.XTESParser;
 import com.idcanet.xtes.xpql.query.Query;
diff --git a/tests/com/idcanet/vasc/tests/SwingTest.java b/tests/com/idcanet/vasc/SwingTest.java
similarity index 99%
rename from tests/com/idcanet/vasc/tests/SwingTest.java
rename to tests/com/idcanet/vasc/SwingTest.java
index 3e00d93..9958453 100644
--- a/tests/com/idcanet/vasc/tests/SwingTest.java
+++ b/tests/com/idcanet/vasc/SwingTest.java
@@ -24,7 +24,7 @@
  * should not be interpreted as representing official policies, either expressed or implied, of IDCA.
  */
 
-package com.idcanet.vasc.tests;
+package com.idcanet.vasc;
 
 import java.io.InputStream;
 import java.util.logging.LogManager;
diff --git a/tests/com/idcanet/vasc/tests/TestModelVascDataSource.java b/tests/com/idcanet/vasc/TestModelVascDataSource.java
similarity index 97%
rename from tests/com/idcanet/vasc/tests/TestModelVascDataSource.java
rename to tests/com/idcanet/vasc/TestModelVascDataSource.java
index a69e873..890ac22 100644
--- a/tests/com/idcanet/vasc/tests/TestModelVascDataSource.java
+++ b/tests/com/idcanet/vasc/TestModelVascDataSource.java
@@ -24,14 +24,14 @@
  * should not be interpreted as representing official policies, either expressed or implied, of IDCA.
  */
 
-package com.idcanet.vasc.tests;
+package com.idcanet.vasc;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 import com.idcanet.vasc.core.VascDataSource;
-import com.idcanet.vasc.tests.models.TestModel;
+import com.idcanet.vasc.models.TestModel;
 
 /**
  * 
diff --git a/tests/com/idcanet/vasc/tests/models/TestModel.java b/tests/com/idcanet/vasc/models/TestModel.java
similarity index 98%
rename from tests/com/idcanet/vasc/tests/models/TestModel.java
rename to tests/com/idcanet/vasc/models/TestModel.java
index c65819c..1f37fc0 100644
--- a/tests/com/idcanet/vasc/tests/models/TestModel.java
+++ b/tests/com/idcanet/vasc/models/TestModel.java
@@ -25,7 +25,7 @@
  * should not be interpreted as representing official policies, either expressed or implied, of IDCA.
  */
 
-package com.idcanet.vasc.tests.models;
+package com.idcanet.vasc.models;
 
 import java.util.Date;