diff --git a/entitymanager/src/test/org/hibernate/ejb/test/Cat.java b/entitymanager/src/test/java/org/hibernate/ejb/test/Cat.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/Cat.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/Cat.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/Distributor.java b/entitymanager/src/test/java/org/hibernate/ejb/test/Distributor.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/Distributor.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/Distributor.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/EJB3TestCase.java b/entitymanager/src/test/java/org/hibernate/ejb/test/EJB3TestCase.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/EJB3TestCase.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/EJB3TestCase.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/EntityManagerTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/EntityManagerTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/Item.java b/entitymanager/src/test/java/org/hibernate/ejb/test/Item.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/Item.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/Item.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/Kitten.java b/entitymanager/src/test/java/org/hibernate/ejb/test/Kitten.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/Kitten.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/Kitten.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/LastUpdateListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/LastUpdateListener.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/LastUpdateListener.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/MyNamingStrategy.java b/entitymanager/src/test/java/org/hibernate/ejb/test/MyNamingStrategy.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/MyNamingStrategy.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/MyNamingStrategy.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/NoOpListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/NoOpListener.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/NoOpListener.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/NoOpListener.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/QueryTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/QueryTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/QueryTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/QueryTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/TestCase.java b/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/TestCase.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/Wallet.java b/entitymanager/src/test/java/org/hibernate/ejb/test/Wallet.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/Wallet.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/Wallet.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/association/AssociationTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/association/AssociationTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/association/AssociationTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/association/AssociationTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/association/Incident.java b/entitymanager/src/test/java/org/hibernate/ejb/test/association/Incident.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/association/Incident.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/association/Incident.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/association/IncidentStatus.java b/entitymanager/src/test/java/org/hibernate/ejb/test/association/IncidentStatus.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/association/IncidentStatus.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/association/IncidentStatus.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/association/Kitchen.java b/entitymanager/src/test/java/org/hibernate/ejb/test/association/Kitchen.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/association/Kitchen.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/association/Kitchen.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/association/Oven.java b/entitymanager/src/test/java/org/hibernate/ejb/test/association/Oven.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/association/Oven.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/association/Oven.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/CommunicationSystem.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CommunicationSystem.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/CommunicationSystem.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CommunicationSystem.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/CountryChecker.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/CountryChecker.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryChecker.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/Customer.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Customer.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/Customer.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Customer.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/Employee.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/Employee.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Employee.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/ExceptionListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/ExceptionListener.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/ExceptionListener.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/ExceptionListener.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/FirstOneListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/FirstOneListener.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/FirstOneListener.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/FirstOneListener.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/IncreaseListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/IncreaseListener.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/IncreaseListener.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/IncreaseListener.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/Person.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Person.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/Person.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Person.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/Plant.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/Plant.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/RemoteControl.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/RemoteControl.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/RemoteControl.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/Rythm.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/Rythm.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/Television.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Television.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/Television.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Television.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/Translation.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Translation.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/Translation.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Translation.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/callbacks/VideoSystem.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/callbacks/VideoSystem.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/VideoSystem.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Author.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Author.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Author.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Author.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/CascadeTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/CascadeTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/CascadeTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/CascadeTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Conference.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Conference.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Conference.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Conference.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/ExtractionDocument.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/ExtractionDocument.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/FetchTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/FetchTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/FetchTest2.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest2.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/FetchTest2.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/FetchTest2.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Grandson.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Grandson.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Grandson.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Grandson.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Parent.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Parent.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Parent.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Parent.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Soldier.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Soldier.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Soldier2.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Soldier2.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Soldier2.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Son.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Son.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Son.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Son.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Song.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Song.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Song.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Song.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Student.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Student.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Student.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Student.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Teacher.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Teacher.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Teacher.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Teacher.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Troop.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Troop.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/cascade/Troop2.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/cascade/Troop2.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Troop2.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/connection/FakeDataSource.java b/entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/connection/FakeDataSource.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSource.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/connection/FakeDataSourceException.java b/entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSourceException.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/connection/FakeDataSourceException.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/connection/FakeDataSourceException.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java b/entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ProgrammaticConfTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/TestCase.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/TestCase.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml b/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/hibernate.cfg.xml
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Cat.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Cat.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Cat.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Cat.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Colony.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Colony.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Colony.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Colony.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Competition.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competition.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Competition.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competition.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Competitor.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competitor.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Competitor.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competitor.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Decorate.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Decorate.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Decorate.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Decorate.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Dog.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dog.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Dog.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dog.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Dress.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dress.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Dress.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dress.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Empire.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Empire.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Empire.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Empire.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/FlushModeTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/FlushModeTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/FlushTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/FlushTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/GetReferenceTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/GetReferenceTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/GetReferenceTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/GetReferenceTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Mail.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Mail.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Mail.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Mail.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/MergeTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/MergeTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Music.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Music.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Music.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Music.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Pet.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Pet.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Pet.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Pet.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/Race.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Race.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/Race.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/Race.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/RefreshTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RefreshTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/RefreshTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/RefreshTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/RemoveTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/RemoveTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/A.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/A.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/B1.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/B1.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/B2.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/B2.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/B3.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B3.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/B3.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B3.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/B4.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B4.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/B4.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B4.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/C1.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C1.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/C1.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C1.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/C2.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C2.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/C2.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C2.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/exception/Music.java b/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/exception/Music.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/exception/Musician.java b/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/exception/Musician.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/hibernate.cfg.xml b/entitymanager/src/test/java/org/hibernate/ejb/test/hibernate.cfg.xml
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/hibernate.cfg.xml
rename to entitymanager/src/test/java/org/hibernate/ejb/test/hibernate.cfg.xml
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/inheritance/Fruit.java b/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/inheritance/Fruit.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java b/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/inheritance/Strawberry.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java b/entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/instrument/Simple.java b/entitymanager/src/test/java/org/hibernate/ejb/test/instrument/Simple.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/instrument/Simple.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/instrument/Simple.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/lob/BlobTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/lob/BlobTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/lob/BlobTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/lob/ImageReader.java b/entitymanager/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/lob/ImageReader.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/lob/ImageReader.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/lock/Lock.java b/entitymanager/src/test/java/org/hibernate/ejb/test/lock/Lock.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/lock/Lock.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/lock/Lock.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/lock/LockTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/lock/LockTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/lock/UnversionedLock.java b/entitymanager/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/lock/UnversionedLock.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/Animal.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Animal.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/Animal.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/Animal.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/Child.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Child.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/Child.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/Child.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/Employee.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employee.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/Employee.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employee.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/Employer.hbm.xml b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.hbm.xml
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/Employer.hbm.xml
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.hbm.xml
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/Employer.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/Employer.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/Employer.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/FindTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/FindTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/FindTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/FindTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/FlushTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/FlushTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/FlushTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/FlushTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/GetLoadTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/GetLoadTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/GetLoadTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/Mammal.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Mammal.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/Mammal.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/Mammal.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/MergeNewTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeNewTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/MergeNewTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeNewTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/MergeTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/MergeTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/MergeTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/Node.hbm.xml b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.hbm.xml
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/Node.hbm.xml
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.hbm.xml
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/Node.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/Node.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/Node.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/NumberedNode.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/NumberedNode.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/NumberedNode.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/NumberedNode.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/Parent.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Parent.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/Parent.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/Parent.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/ParentChild.hbm.xml b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/ParentChild.hbm.xml
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/ParentChild.hbm.xml
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/ParentChild.hbm.xml
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/PersistTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/PersistTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/Reptile.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Reptile.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/Reptile.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/Reptile.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/ops/Workload.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Workload.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/ops/Workload.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/ops/Workload.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/cfgxmlpar/Morito.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/cfgxmlpar/Morito.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/cfgxmlpar/Morito.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/cfgxmlpar/Morito.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/ApplicationServer.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/ApplicationServer.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/ApplicationServer.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/ApplicationServer.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/Lighter.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Lighter.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/Lighter.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Lighter.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/Money.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/Money.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/Mouse.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Mouse.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/Mouse.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Mouse.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/Version.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Version.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/Version.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Version.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/package-info.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/package-info.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/defaultpar/package-info.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/package-info.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/excludehbmpar/Caipirinha.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/excludehbmpar/Caipirinha.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/excludehbmpar/Caipirinha.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/excludehbmpar/Caipirinha.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/explicitpar/Washer.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explicitpar/Washer.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/explicitpar/Washer.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/explicitpar/Washer.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/explodedpar/Carpet.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Carpet.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/explodedpar/Carpet.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Carpet.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/explodedpar/Elephant.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Elephant.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/explodedpar/Elephant.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/Elephant.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/explodedpar/package-info.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/package-info.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/explodedpar/package-info.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/explodedpar/package-info.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/externaljar/Scooter.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/externaljar/Scooter.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/externaljar/Scooter.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/externaljar/Scooter.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/overridenpar/Bug.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/overridenpar/Bug.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/spacepar/Bug.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/spacepar/Bug.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/various/Airplane.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Airplane.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/various/Airplane.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Airplane.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/various/Seat.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Seat.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/various/Seat.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Seat.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/war/ApplicationServer.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/ApplicationServer.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/war/ApplicationServer.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/ApplicationServer.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/war/IncrementListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/IncrementListener.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/war/IncrementListener.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/IncrementListener.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/war/Lighter.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Lighter.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/war/Lighter.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Lighter.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/war/Money.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Money.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/war/Money.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Money.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/war/Mouse.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Mouse.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/war/Mouse.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Mouse.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/war/Version.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Version.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/war/Version.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Version.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/pack/war/package-info.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/package-info.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/pack/war/package-info.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/package-info.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/package-info.java b/entitymanager/src/test/java/org/hibernate/ejb/test/package-info.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/package-info.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/package-info.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/packaging/JarVisitorTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/packaging/JarVisitorTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/transaction/Book.java b/entitymanager/src/test/java/org/hibernate/ejb/test/transaction/Book.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/transaction/Book.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/transaction/Book.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/xml/Address.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Address.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/xml/Address.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/xml/Address.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/xml/Article.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Article.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/xml/Article.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/xml/Article.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/xml/CounterListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/xml/CounterListener.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/xml/Employee.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Employee.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/xml/Employee.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/xml/Employee.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/xml/Light.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Light.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/xml/Light.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/xml/Light.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/xml/Lighter.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Lighter.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/xml/Lighter.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/xml/Lighter.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/xml/XmlTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlTest.java
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/xml/XmlTest.java
rename to entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlTest.java
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/xml/orm.xml b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm.xml
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/xml/orm.xml
rename to entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm.xml
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/xml/orm2.xml b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm2.xml
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/xml/orm2.xml
rename to entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm2.xml
diff --git a/entitymanager/src/test/org/hibernate/ejb/test/xml/orm3.xml b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm3.xml
similarity index 100%
rename from entitymanager/src/test/org/hibernate/ejb/test/xml/orm3.xml
rename to entitymanager/src/test/java/org/hibernate/ejb/test/xml/orm3.xml