diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/CompanyModelTest.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/CompanyModelTest.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/CompanyModelTest.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/CompanyModelTest.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IAddress.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IAddress.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IAddress.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IAddress.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/ICompany.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICompany.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/ICompany.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICompany.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/ICustomer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICustomer.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/ICustomer.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ICustomer.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IFullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IFullTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IFullTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IFullTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/ILineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ILineItem.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/ILineItem.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/ILineItem.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IPartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPartTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IPartTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPartTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IPerson.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPerson.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IPerson.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IPerson.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IProduct.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProduct.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IProduct.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProduct.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProductOrder.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/IProductOrder.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/IProductOrder.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Address.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Address.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Address.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Company.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Company.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Company.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Customer.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Customer.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Customer.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Employee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Employee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Employee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/FullTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/FullTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/FullTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/LineItem.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/LineItem.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/LineItem.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/PartTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/PartTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/PartTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Person.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Person.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Person.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Product.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/Product.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/Product.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/ProductOrder.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/ProductOrder.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/ProductOrder.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/TestBasicCompanyModel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/TestBasicCompanyModel.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/basic/TestBasicCompanyModel.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/basic/TestBasicCompanyModel.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Address.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Address.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Address.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Company.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Company.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Company.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Customer.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Customer.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Customer.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Employee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Employee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Employee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/FullTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/FullTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/FullTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/LineItem.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/LineItem.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/LineItem.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/PartTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/PartTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/PartTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Person.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Person.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Person.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Product.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/Product.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/Product.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/ProductOrder.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/ProductOrder.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/ProductOrder.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/TestLazyCompanyModel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/TestLazyCompanyModel.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/fetchlazy/TestLazyCompanyModel.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/fetchlazy/TestLazyCompanyModel.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Address.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Address.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Address.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Company.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Company.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Company.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Customer.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Customer.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Customer.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Employee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Employee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Employee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/FullTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/FullTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/FullTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/LineItem.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/LineItem.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/LineItem.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/PartTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/PartTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/PartTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Person.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Person.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Person.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Product.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/Product.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/Product.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/ProductOrder.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/ProductOrder.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/ProductOrder.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/TestIdClassCompanyModel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/TestIdClassCompanyModel.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/idclass/TestIdClassCompanyModel.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/idclass/TestIdClassCompanyModel.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Address.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Address.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Address.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Company.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Company.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Company.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Customer.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Customer.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Customer.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Employee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Employee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Employee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/FullTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/FullTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/FullTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/LineItem.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/LineItem.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/LineItem.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/PartTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/PartTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/PartTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Person.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Person.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Person.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Product.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/Product.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/Product.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/ProductOrder.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/ProductOrder.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/ProductOrder.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/TestJoinedCompanyModel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/TestJoinedCompanyModel.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/joined/TestJoinedCompanyModel.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/joined/TestJoinedCompanyModel.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Address.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Address.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Address.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Address.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Company.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Company.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Company.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Company.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Customer.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Customer.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Customer.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Customer.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Employee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Employee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Employee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Employee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/FullTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/FullTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/FullTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/FullTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/LineItem.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/LineItem.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/LineItem.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/LineItem.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/PartTimeEmployee.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/PartTimeEmployee.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/PartTimeEmployee.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/PartTimeEmployee.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Person.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Person.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Person.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Person.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Product.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Product.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/Product.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/Product.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/ProductOrder.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/ProductOrder.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/ProductOrder.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/ProductOrder.java
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/TestPropertyCompanyModel.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/TestPropertyCompanyModel.java
similarity index 100%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/propertyaccess/TestPropertyCompanyModel.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/models/company/propertyaccess/TestPropertyCompanyModel.java