diff --git a/...ations/global/FetchProfileBinderTest.java → ...ations/global/FetchProfileBinderTest.java b/...ations/global/FetchProfileBinderTest.java → ...ations/global/FetchProfileBinderTest.java
diff --git a/...e/annotations/global/QueryBinderTest.java → ...e/annotations/global/QueryBinderTest.java b/...e/annotations/global/QueryBinderTest.java → ...e/annotations/global/QueryBinderTest.java
diff --git a/...ons/util/BaseAnnotationIndexTestCase.java → ...ons/util/BaseAnnotationIndexTestCase.java b/...ons/util/BaseAnnotationIndexTestCase.java → ...ons/util/BaseAnnotationIndexTestCase.java
diff --git a/...tations/util/EmbeddableHierarchyTest.java → ...tations/util/EmbeddableHierarchyTest.java b/...tations/util/EmbeddableHierarchyTest.java → ...tations/util/EmbeddableHierarchyTest.java
diff --git a/...annotations/util/EntityHierarchyTest.java → ...annotations/util/EntityHierarchyTest.java b/...annotations/util/EntityHierarchyTest.java → ...annotations/util/EntityHierarchyTest.java
diff --git a/...ations/util/GenericTypeDiscoveryTest.java → ...ations/util/GenericTypeDiscoveryTest.java b/...ations/util/GenericTypeDiscoveryTest.java → ...ations/util/GenericTypeDiscoveryTest.java
diff --git a/...ce/annotations/util/JandexHelperTest.java → ...ce/annotations/util/JandexHelperTest.java b/...ce/annotations/util/JandexHelperTest.java → ...ce/annotations/util/JandexHelperTest.java
diff --git a/...e/annotations/util/TypeDiscoveryTest.java → ...e/annotations/util/TypeDiscoveryTest.java b/...e/annotations/util/TypeDiscoveryTest.java → ...e/annotations/util/TypeDiscoveryTest.java
diff --git a/...amodel/source/annotations/xml/Father.java → ...ternal/source/annotations/xml/Father.java b/...amodel/source/annotations/xml/Father.java → ...ternal/source/annotations/xml/Father.java
diff --git a/...ce/annotations/xml/OrmXmlParserTests.java → ...ce/annotations/xml/OrmXmlParserTests.java b/...ce/annotations/xml/OrmXmlParserTests.java → ...ce/annotations/xml/OrmXmlParserTests.java
diff --git a/...etamodel/source/annotations/xml/Star.java → ...internal/source/annotations/xml/Star.java b/...etamodel/source/annotations/xml/Star.java → ...internal/source/annotations/xml/Star.java
diff --git a/...ations/xml/mocker/AbstractMockerTest.java → ...ations/xml/mocker/AbstractMockerTest.java b/...ations/xml/mocker/AbstractMockerTest.java → ...ations/xml/mocker/AbstractMockerTest.java
diff --git a/...source/annotations/xml/mocker/Author.java → ...source/annotations/xml/mocker/Author.java b/...source/annotations/xml/mocker/Author.java → ...source/annotations/xml/mocker/Author.java
diff --git a/...notations/xml/mocker/BasicMockerTest.java → ...notations/xml/mocker/BasicMockerTest.java b/...notations/xml/mocker/BasicMockerTest.java → ...notations/xml/mocker/BasicMockerTest.java
diff --git a/...l/source/annotations/xml/mocker/Book.java → ...l/source/annotations/xml/mocker/Book.java b/...l/source/annotations/xml/mocker/Book.java → ...l/source/annotations/xml/mocker/Book.java
diff --git a/...ocker/DefaultConfigurationHelperTest.java → ...ocker/DefaultConfigurationHelperTest.java b/...ocker/DefaultConfigurationHelperTest.java → ...ocker/DefaultConfigurationHelperTest.java
diff --git a/...ations/xml/mocker/EntityListenerTest.java → ...ations/xml/mocker/EntityListenerTest.java b/...ations/xml/mocker/EntityListenerTest.java → ...ations/xml/mocker/EntityListenerTest.java
diff --git a/...otations/xml/mocker/IndexBuilderTest.java → ...otations/xml/mocker/IndexBuilderTest.java b/...otations/xml/mocker/IndexBuilderTest.java → ...otations/xml/mocker/IndexBuilderTest.java
diff --git a/...l/source/annotations/xml/mocker/Item.java → ...l/source/annotations/xml/mocker/Item.java b/...l/source/annotations/xml/mocker/Item.java → ...l/source/annotations/xml/mocker/Item.java
diff --git a/.../annotations/xml/mocker/ItemListener.java → .../annotations/xml/mocker/ItemListener.java b/.../annotations/xml/mocker/ItemListener.java → .../annotations/xml/mocker/ItemListener.java
diff --git a/.../annotations/xml/mocker/OverrideTest.java → .../annotations/xml/mocker/OverrideTest.java b/.../annotations/xml/mocker/OverrideTest.java → .../annotations/xml/mocker/OverrideTest.java
diff --git a/...mocker/PersistenceMetadataMockerTest.java → ...mocker/PersistenceMetadataMockerTest.java b/...mocker/PersistenceMetadataMockerTest.java → ...mocker/PersistenceMetadataMockerTest.java
diff --git a/.../source/annotations/xml/mocker/Topic.java → .../source/annotations/xml/mocker/Topic.java b/.../source/annotations/xml/mocker/Topic.java → .../source/annotations/xml/mocker/Topic.java
diff --git a/...rce/annotations/xml/mocker/XmlHelper.java → ...rce/annotations/xml/mocker/XmlHelper.java b/...rce/annotations/xml/mocker/XmlHelper.java → ...rce/annotations/xml/mocker/XmlHelper.java
diff --git a/...tamodel/source/internal/package-info.java → ...tamodel/internal/source/package-info.java b/...tamodel/source/internal/package-info.java → ...tamodel/internal/source/package-info.java
diff --git a/...el/binding/AbstractBasicBindingTests.java → ...pi/binding/AbstractBasicBindingTests.java b/...el/binding/AbstractBasicBindingTests.java → ...pi/binding/AbstractBasicBindingTests.java
diff --git a/.../binding/BasicAnnotationBindingTests.java → .../binding/BasicAnnotationBindingTests.java b/.../binding/BasicAnnotationBindingTests.java → .../binding/BasicAnnotationBindingTests.java
diff --git a/.../binding/BasicCollectionBindingTests.java → .../binding/BasicCollectionBindingTests.java b/.../binding/BasicCollectionBindingTests.java → .../binding/BasicCollectionBindingTests.java
diff --git a/...tamodel/binding/BasicHbmBindingTests.java → ...del/spi/binding/BasicHbmBindingTests.java b/...tamodel/binding/BasicHbmBindingTests.java → ...del/spi/binding/BasicHbmBindingTests.java
diff --git a/...inding/EntityWithBasicCollections.hbm.xml → ...inding/EntityWithBasicCollections.hbm.xml b/...inding/EntityWithBasicCollections.hbm.xml → ...inding/EntityWithBasicCollections.hbm.xml
diff --git a/...l/binding/EntityWithBasicCollections.java → ...i/binding/EntityWithBasicCollections.java b/...l/binding/EntityWithBasicCollections.java → ...i/binding/EntityWithBasicCollections.java
diff --git a/...metamodel/binding/ManyToOneEntity.hbm.xml → ...model/spi/binding/ManyToOneEntity.hbm.xml b/...metamodel/binding/ManyToOneEntity.hbm.xml → ...model/spi/binding/ManyToOneEntity.hbm.xml
diff --git a/...te/metamodel/binding/ManyToOneEntity.java → ...etamodel/spi/binding/ManyToOneEntity.java b/...te/metamodel/binding/ManyToOneEntity.java → ...etamodel/spi/binding/ManyToOneEntity.java
diff --git a/...te/metamodel/binding/SimpleEntity.hbm.xml → ...etamodel/spi/binding/SimpleEntity.hbm.xml b/...te/metamodel/binding/SimpleEntity.hbm.xml → ...etamodel/spi/binding/SimpleEntity.hbm.xml
diff --git a/...rnate/metamodel/binding/SimpleEntity.java → ...e/metamodel/spi/binding/SimpleEntity.java b/...rnate/metamodel/binding/SimpleEntity.java → ...e/metamodel/spi/binding/SimpleEntity.java
diff --git a/...tamodel/binding/SimpleEntitySubClass.java → ...del/spi/binding/SimpleEntitySubClass.java b/...tamodel/binding/SimpleEntitySubClass.java → ...del/spi/binding/SimpleEntitySubClass.java
diff --git a/...g/SimpleEntityWithSimpleComponent.hbm.xml → ...g/SimpleEntityWithSimpleComponent.hbm.xml b/...g/SimpleEntityWithSimpleComponent.hbm.xml → ...g/SimpleEntityWithSimpleComponent.hbm.xml
diff --git a/...ding/SimpleEntityWithSimpleComponent.java → ...ding/SimpleEntityWithSimpleComponent.java b/...ding/SimpleEntityWithSimpleComponent.java → ...ding/SimpleEntityWithSimpleComponent.java
diff --git a/...odel/binding/SimpleValueBindingTests.java → .../spi/binding/SimpleValueBindingTests.java b/...odel/binding/SimpleValueBindingTests.java → .../spi/binding/SimpleValueBindingTests.java
diff --git a/...del/binding/SimpleVersionedEntity.hbm.xml → ...spi/binding/SimpleVersionedEntity.hbm.xml b/...del/binding/SimpleVersionedEntity.hbm.xml → ...spi/binding/SimpleVersionedEntity.hbm.xml
diff --git a/...amodel/binding/SimpleVersionedEntity.java → ...el/spi/binding/SimpleVersionedEntity.java b/...amodel/binding/SimpleVersionedEntity.java → ...el/spi/binding/SimpleVersionedEntity.java
diff --git a/...tamodel/binding/SimpleVersionedEntity.xml → ...del/spi/binding/SimpleVersionedEntity.xml b/...tamodel/binding/SimpleVersionedEntity.xml → ...del/spi/binding/SimpleVersionedEntity.xml
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/package-info.java b/hibernate-core/src/test/java/org/hibernate/metamodel/spi/binding/package-info.java
diff --git a/...metamodel/relational/ObjectNameTests.java → ...model/spi/relational/ObjectNameTests.java b/...metamodel/relational/ObjectNameTests.java → ...model/spi/relational/ObjectNameTests.java
diff --git a/...el/relational/TableManipulationTests.java → ...pi/relational/TableManipulationTests.java b/...el/relational/TableManipulationTests.java → ...pi/relational/TableManipulationTests.java
diff --git a/...nate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java b/...nate-core/src/test/java/org/hibernate/test/cfg/persister/GoofyPersisterClassProvider.java
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java
diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/JpaIntegrator.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/JpaIntegrator.java
diff --git a/...er/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersisterClassProviderTest.java b/...er/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersisterClassProviderTest.java
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java