diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/.classpath b/JPA-RS/org.eclipse.persistence.jpars.test/.classpath
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/.classpath
rename to JPA-RS/org.eclipse.persistence.jpars.test/.classpath
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/.project b/JPA-RS/org.eclipse.persistence.jpars.test/.project
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/.project
rename to JPA-RS/org.eclipse.persistence.jpars.test/.project
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/.settings/org.eclipse.jdt.core.prefs b/JPA-RS/org.eclipse.persistence.jpars.test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/.settings/org.eclipse.jdt.core.prefs
rename to JPA-RS/org.eclipse.persistence.jpars.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/eclipselink.jpa-rs.properties b/JPA-RS/org.eclipse.persistence.jpars.test/eclipselink.jpa-rs.properties
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/eclipselink.jpa-rs.properties
rename to JPA-RS/org.eclipse.persistence.jpars.test/eclipselink.jpa-rs.properties
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/META-INF/persistence.xml b/JPA-RS/org.eclipse.persistence.jpars.test/src/META-INF/persistence.xml
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/META-INF/persistence.xml
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/META-INF/persistence.xml
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/AllJavaSETests.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/AllJavaSETests.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/AllJavaSETests.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/AllJavaSETests.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/bootstrap/TestBootstrap.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/bootstrap/TestBootstrap.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/bootstrap/TestBootstrap.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/bootstrap/TestBootstrap.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/crud/CRUDTests.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/crud/CRUDTests.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/crud/CRUDTests.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/crud/CRUDTests.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/crud/StaticCrudTests.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/crud/StaticCrudTests.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/crud/StaticCrudTests.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/crud/StaticCrudTests.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/http/BaseHttpServerTest.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/http/BaseHttpServerTest.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/http/BaseHttpServerTest.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/http/BaseHttpServerTest.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/internal/AuctionPersistenceContextTests.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/internal/AuctionPersistenceContextTests.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/internal/AuctionPersistenceContextTests.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/internal/AuctionPersistenceContextTests.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticAuction.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticAuction.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticAuction.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticAuction.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticBid.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticBid.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticBid.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticBid.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticUser.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticUser.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticUser.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/model/StaticUser.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/service/TestService.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/service/TestService.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/service/TestService.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/service/TestService.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/ExamplePropertiesLoader.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/ExamplePropertiesLoader.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/ExamplePropertiesLoader.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/ExamplePropertiesLoader.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/TestHttpHeaders.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/TestHttpHeaders.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/TestHttpHeaders.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/TestHttpHeaders.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/TestURIInfo.java b/JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/TestURIInfo.java
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/TestURIInfo.java
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/org/eclipse/persistence/jpars/test/util/TestURIInfo.java
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/xmldocs/auction-orm.xml b/JPA-RS/org.eclipse.persistence.jpars.test/src/xmldocs/auction-orm.xml
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/xmldocs/auction-orm.xml
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/xmldocs/auction-orm.xml
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/xmldocs/auction-persistence.xml b/JPA-RS/org.eclipse.persistence.jpars.test/src/xmldocs/auction-persistence.xml
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/xmldocs/auction-persistence.xml
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/xmldocs/auction-persistence.xml
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/xmldocs/phonebook-orm.xml b/JPA-RS/org.eclipse.persistence.jpars.test/src/xmldocs/phonebook-orm.xml
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/xmldocs/phonebook-orm.xml
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/xmldocs/phonebook-orm.xml
diff --git a/JPA-RS/tests/org.eclipse.persistence.jpars.test/src/xmldocs/phonebook-persistence.xml b/JPA-RS/org.eclipse.persistence.jpars.test/src/xmldocs/phonebook-persistence.xml
similarity index 100%
rename from JPA-RS/tests/org.eclipse.persistence.jpars.test/src/xmldocs/phonebook-persistence.xml
rename to JPA-RS/org.eclipse.persistence.jpars.test/src/xmldocs/phonebook-persistence.xml