diff --git a/hibernate-envers/src/matrix/java/ee/estonia/entities/Child.java b/hibernate-envers/src/test/java/ee/estonia/entities/Child.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/ee/estonia/entities/Child.java
rename to hibernate-envers/src/test/java/ee/estonia/entities/Child.java
diff --git a/hibernate-envers/src/matrix/java/ee/estonia/entities/Parent.java b/hibernate-envers/src/test/java/ee/estonia/entities/Parent.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/ee/estonia/entities/Parent.java
rename to hibernate-envers/src/test/java/ee/estonia/entities/Parent.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractEnversTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractEnversTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractEnversTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractEnversTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractOneSessionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractOneSessionTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/EnversRunner.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/EnversRunner.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/EnversRunner.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/EnversRunner.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/Priority.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/Priority.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/Priority.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/Priority.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/IntNoAutoIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntNoAutoIdTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/IntNoAutoIdTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntNoAutoIdTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/IntTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/IntTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/IntTestPrivSeqEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntTestPrivSeqEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/IntTestPrivSeqEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/IntTestPrivSeqEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/PrimitiveTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/PrimitiveTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/PrimitiveTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/PrimitiveTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/StrIntTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrIntTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/StrIntTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrIntTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/StrTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/StrTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/StrTestEntityComparator.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntityComparator.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/StrTestEntityComparator.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestEntityComparator.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/StrTestPrivSeqEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestPrivSeqEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/StrTestPrivSeqEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/StrTestPrivSeqEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/UnversionedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/UnversionedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/UnversionedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/UnversionedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/UnversionedStrTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/UnversionedStrTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/UnversionedStrTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/UnversionedStrTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/collection/EnumSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumSetEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/collection/EnumSetEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EnumSetEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/collection/StringListEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringListEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/collection/StringListEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringListEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/collection/StringMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringMapEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/collection/StringMapEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringMapEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/collection/StringSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringSetEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/collection/StringSetEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/StringSetEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/Component1.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component1.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/Component1.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component1.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/Component2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component2.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/Component2.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/Component2.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/ComponentSetTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentSetTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/ComponentSetTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentSetTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/ComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/ComponentTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/ComponentTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/DefaultValueComponent1.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponent1.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/DefaultValueComponent1.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponent1.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/DefaultValueComponent2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponent2.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/DefaultValueComponent2.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponent2.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/DefaultValueComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponentTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/DefaultValueComponentTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/DefaultValueComponentTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/UniquePropsEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/UniquePropsEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/UniquePropsEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/UniquePropsEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/UniquePropsNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/UniquePropsNotAuditedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/UniquePropsNotAuditedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/UniquePropsNotAuditedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponent.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponent.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponent.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponentTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponentTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/ManyToOneComponentTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponent.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponent.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponent.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/NotAuditedManyToOneComponentTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponent.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponent.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponent.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponentTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponentTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/components/relations/OneToManyComponentTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/customtype/Component.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/Component.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/customtype/Component.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/Component.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/customtype/CompositeCustomTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/CompositeCustomTypeEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/customtype/CompositeCustomTypeEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/CompositeCustomTypeEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/customtype/CompositeTestUserType.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/CompositeTestUserType.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/customtype/CompositeTestUserType.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/CompositeTestUserType.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/customtype/ParametrizedCustomTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedCustomTypeEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/customtype/ParametrizedCustomTypeEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedCustomTypeEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/customtype/ParametrizedTestUserType.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedTestUserType.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/customtype/ParametrizedTestUserType.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/customtype/ParametrizedTestUserType.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/CompositeDateIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CompositeDateIdTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/CompositeDateIdTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CompositeDateIdTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/CustomEnum.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CustomEnum.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/CustomEnum.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CustomEnum.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/CustomEnumUserType.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CustomEnumUserType.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/CustomEnumUserType.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/CustomEnumUserType.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/DateEmbId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/DateEmbId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/DateEmbId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/DateEmbId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/DateIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/DateIdTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/DateIdTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/DateIdTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/EmbId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/EmbId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/EmbIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/EmbIdTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomType.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomType.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomType.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomType.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomTypeTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomTypeTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomTypeTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/EmbIdWithCustomTypeTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/MulId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/MulId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/MulId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/MulId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/MulIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/MulIdTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/ids/MulIdTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/ids/MulIdTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/ListOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwnedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/ListOwnedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwnedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/ListOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwningEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/ListOwningEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/ListOwningEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/MapOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwnedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/MapOwnedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwnedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/MapOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwningEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/MapOwningEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/MapOwningEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/SetOwnedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwnedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/SetOwnedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwnedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/SetOwningEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwningEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/SetOwningEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SetOwningEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/SortedSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SortedSetEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/SortedSetEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/SortedSetEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/WhereJoinTableEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/WhereJoinTableEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/WhereJoinTableEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/WhereJoinTableEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning1Entity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning1Entity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning1Entity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning1Entity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning2Entity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning2Entity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning2Entity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/biowned/ListBiowning2Entity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/sametable/Child1Entity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/Child1Entity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/sametable/Child1Entity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/Child1Entity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/sametable/Child2Entity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/Child2Entity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/sametable/Child2Entity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/Child2Entity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/sametable/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/ParentEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/sametable/ParentEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/sametable/ParentEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ListUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ListUniEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ListUniEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/ListUniEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MIndexedListTargetNotAuditedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/M2MTargetNotAuditedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/unidirectional/MapUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/MapUniEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/unidirectional/MapUniEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/MapUniEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/unidirectional/SetUniEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/SetUniEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytomany/unidirectional/SetUniEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytomany/unidirectional/SetUniEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytoone/unidirectional/TargetNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytoone/unidirectional/TargetNotAuditedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/manytoone/unidirectional/TargetNotAuditedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/manytoone/unidirectional/TargetNotAuditedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/CollectionRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/CollectionRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/CollectionRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/CollectionRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/CollectionRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ListRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ListRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ListRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ListRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ListRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/SetRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/SetRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/SetRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/SetRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/SetRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity1.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefEdEntity2.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleListJoinColumnBidirectionalRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleSetRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleSetRefCollEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleSetRefCollEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/DoubleSetRefCollEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/IndexedListJoinColumnBidirectionalRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdChildEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefEdParentEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalInheritanceRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListJoinColumnBidirectionalRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListRefCollEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ListRefCollEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ListRefCollEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/SetJoinColumnRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetJoinColumnRefCollEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/SetJoinColumnRefCollEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetJoinColumnRefCollEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/SetRefCollEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetRefCollEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/SetRefCollEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/SetRefCollEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityEmbId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityMulId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityMulId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityMulId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/ids/SetRefCollEntityMulId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ChildIndexedListJoinColumnBidirectionalRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentIndexedListJoinColumnBidirectionalRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/detached/inheritance/ParentOwnedIndexedListJoinColumnBidirectionalRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdEmbIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdEmbIdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdEmbIdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdEmbIdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdMulIdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdMulIdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefEdMulIdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngEmbIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngEmbIdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngEmbIdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngEmbIdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngMulIdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngMulIdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/onetomany/ids/SetRefIngMulIdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/CustomDataRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomDataRevEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/CustomDataRevEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomDataRevEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/CustomDateRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomDateRevEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/CustomDateRevEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomDateRevEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/CustomPropertyAccessRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomPropertyAccessRevEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/CustomPropertyAccessRevEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomPropertyAccessRevEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/CustomRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/CustomRevEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/CustomRevEntityColumnMapping.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntityColumnMapping.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/CustomRevEntityColumnMapping.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/CustomRevEntityColumnMapping.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/AnnotatedTrackingRevisionEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/CustomTrackingRevisionListener.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionListener.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ModifiedEntityTypeEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/Country.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/Country.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/Country.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/Country.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/FieldAccessType.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/FieldAccessType.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/FieldAccessType.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/FieldAccessType.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/FieldAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/FieldAccessTypeEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/FieldAccessTypeEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/FieldAccessTypeEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/ImmutableClassAccessType.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/ImmutableClassAccessType.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/ImmutableClassAccessType.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/ImmutableClassAccessType.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessType.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/MixedAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessTypeEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/MixedAccessTypeEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/MixedAccessTypeEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessType.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessType.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessType.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessType.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessTypeEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessTypeEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/accesstype/PropertyAccessTypeEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/auditReader/AuditReaderAPITest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/AuditReaderAPITest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/auditReader/AuditReaderAPITest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/AuditReaderAPITest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/auditReader/AuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/AuditedTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/auditReader/AuditedTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/AuditedTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/auditReader/NotAuditedTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/NotAuditedTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/auditReader/NotAuditedTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/auditReader/NotAuditedTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/BasicTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity1.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/BasicTestEntity1.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity1.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/BasicTestEntity2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity2.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/BasicTestEntity2.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity2.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/BasicTestEntity3.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity3.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/BasicTestEntity3.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity3.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/BasicTestEntity4.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity4.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/BasicTestEntity4.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/BasicTestEntity4.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/Delete.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/Delete.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/EmptyStringTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/EmptyStringTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/EmptyStringTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/EmptyStringTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/GlobalVersioned.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/GlobalVersioned.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/GlobalVersioned.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/GlobalVersioned.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ManyOperationsInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ManyOperationsInTransaction.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ManyOperationsInTransaction.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ManyOperationsInTransaction.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/NoneAudited.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NoneAudited.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/NoneAudited.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NoneAudited.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/NotVersioned.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NotVersioned.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/NotVersioned.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NotVersioned.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/NullProperties.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NullProperties.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/NullProperties.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/NullProperties.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ScalePrecisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ScalePrecisionEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ScalePrecisionEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/ScalePrecisionEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/Simple.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/Simple.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Simple.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/SingleOperationInTransaction.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/SingleOperationInTransaction.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/SingleOperationInTransaction.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/SingleOperationInTransaction.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/UnversionedPropertiesChange.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedPropertiesChange.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/UnversionedPropertiesChange.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedPropertiesChange.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/cache/OneToManyCache.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToManyCache.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/cache/OneToManyCache.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToManyCache.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/cache/OneToOneCache.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToOneCache.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/cache/OneToOneCache.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/OneToOneCache.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/cache/QueryCache.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/QueryCache.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/cache/QueryCache.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/cache/QueryCache.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/EnumSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/EnumSet.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/StringList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringList.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/StringList.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringList.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/StringMap.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMap.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/StringMap.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringMap.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/StringSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringSet.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/StringSet.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/StringSet.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKey.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/ComponentMapKeyEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKey.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKeyEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKeyEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/mapkey/IdMapKeyEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeNoRevisionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeNoRevisionTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeNoRevisionTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeNoRevisionTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeRevisionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeRevisionTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeRevisionTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/CollectionChangeRevisionTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/norevision/Name.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Name.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/norevision/Name.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Name.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/norevision/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Person.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/collection/norevision/Person.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/Person.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/Components.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/Components.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/PropertiesGroupTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/PropertiesGroupTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/PropertiesGroupTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/PropertiesGroupTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/collections/CollectionOfComponents.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/CollectionOfComponents.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/collections/CollectionOfComponents.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/CollectionOfComponents.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/NotAuditedManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/NotAuditedManyToOneInComponent.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/NotAuditedManyToOneInComponent.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/NotAuditedManyToOneInComponent.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/customtype/CompositeCustom.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/CompositeCustom.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/customtype/CompositeCustom.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/CompositeCustom.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ParametrizedCustom.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/DateTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/DateTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/DateTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/Dates.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Dates.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/Dates.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Dates.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/EnumTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/Enums.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Enums.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/Enums.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Enums.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/LobSerializables.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/LobSerializables.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/LobTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/LobTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/Lobs.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/Lobs.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/SerObject.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerObject.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/SerObject.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerObject.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/SerializableTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/Serializables.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Serializables.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/data/Serializables.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Serializables.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/Person.java
similarity index 93%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/Person.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/Person.java
index 496fce2b54..2c4991a990 100644
--- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/Person.java
@@ -1,50 +1,50 @@
 package org.hibernate.envers.test.integration.entityNames.auditedEntity;
 import org.hibernate.envers.Audited;
-
-/**
- * @author Hernán Chanfreau
- * 
- */
-
-@Audited
-public class Person {
-	
-	private long id;
-	
-	private String name;
-	
-	private int age;
-	
-	public Person(){ }
-	
-	public Person(String name, int age){
-		this.name = name;
-		this.age = age;
-	}
-	
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public int getAge() {
-		return age;
-	}
-
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-}
+
+/**
+ * @author Hernán Chanfreau
+ * 
+ */
+
+@Audited
+public class Person {
+	
+	private long id;
+	
+	private String name;
+	
+	private int age;
+	
+	public Person(){ }
+	
+	public Person(String name, int age){
+		this.name = name;
+		this.age = age;
+	}
+	
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+}
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/auditedEntity/ReadEntityWhitEntityNameTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Car.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Car.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Car.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Person.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Person.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/Person.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/manyToManyAudited/ReadEntityWithAuditedManyToManyTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Car.java
similarity index 93%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Car.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Car.java
index dd98e0bf0a..5498c1ddbf 100644
--- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Car.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Car.java
@@ -1,55 +1,55 @@
-package org.hibernate.envers.test.integration.entityNames.oneToManyAudited;
-import java.util.List;
-
-import org.hibernate.envers.Audited;
-
-/**
- * @author Hernán Chanfreau
- * 
- */
-
-@Audited
-public class Car {
-	
-	private long id;
-	
-	private int number;
-	
-	private List<Person> owners;
-
-	
-	public Car() { }
-
-	public Car(int number, List<Person> owners) {
-		this.number = number;
-		this.owners = owners;
-	}
-
-	
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public List<Person> getOwners() {
-		return owners;
-	}
-
-	public void setOwners(List<Person> owners) {
-		this.owners = owners;
-	}	
-
-	public int getNumber() {
-		return number;
-	}
-
-	public void setNumber(int number) {
-		this.number = number;
-	}
-
-
-
-}
+package org.hibernate.envers.test.integration.entityNames.oneToManyAudited;
+import java.util.List;
+
+import org.hibernate.envers.Audited;
+
+/**
+ * @author Hern&aacute;n Chanfreau
+ * 
+ */
+
+@Audited
+public class Car {
+	
+	private long id;
+	
+	private int number;
+	
+	private List<Person> owners;
+
+	
+	public Car() { }
+
+	public Car(int number, List<Person> owners) {
+		this.number = number;
+		this.owners = owners;
+	}
+
+	
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public List<Person> getOwners() {
+		return owners;
+	}
+
+	public void setOwners(List<Person> owners) {
+		this.owners = owners;
+	}	
+
+	public int getNumber() {
+		return number;
+	}
+
+	public void setNumber(int number) {
+		this.number = number;
+	}
+
+
+
+}
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Person.java
similarity index 93%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Person.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Person.java
index 934abf6d33..b253ebff5a 100644
--- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/Person.java
@@ -1,50 +1,50 @@
 package org.hibernate.envers.test.integration.entityNames.oneToManyAudited;
 import org.hibernate.envers.Audited;
-
-/**
- * @author Hern&aacute;n Chanfreau
- * 
- */
-
-@Audited
-public class Person {
-	
-	private long id;
-	
-	private String name;
-	
-	private int age;
-	
-	public Person(){ }
-	
-	public Person(String name, int age){
-		this.name = name;
-		this.age = age;
-	}
-	
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public int getAge() {
-		return age;
-	}
-
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-}
+
+/**
+ * @author Hern&aacute;n Chanfreau
+ * 
+ */
+
+@Audited
+public class Person {
+	
+	private long id;
+	
+	private String name;
+	
+	private int age;
+	
+	public Person(){ }
+	
+	public Person(String name, int age){
+		this.name = name;
+		this.age = age;
+	}
+	
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+}
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyAudited/ReadEntityWithAuditedCollectionTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Car.java
similarity index 93%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Car.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Car.java
index de3f48ea09..ffafbc259c 100644
--- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Car.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Car.java
@@ -1,57 +1,57 @@
-package org.hibernate.envers.test.integration.entityNames.oneToManyNotAudited;
-import java.util.List;
-
-import org.hibernate.envers.Audited;
-import org.hibernate.envers.RelationTargetAuditMode;
-
-/**
- * @author Hern&aacute;n Chanfreau
- * 
- */
-
-public class Car {
-	
-	private long id;
-	
-	private int number;
-	
-	private List<Person> owners;
-
-	
-	public Car() { }
-
-	public Car(int number, List<Person> owners) {
-		this.number = number;
-		this.owners = owners;
-	}
-
-	
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	@Audited(targetAuditMode=RelationTargetAuditMode.NOT_AUDITED)
-	public List<Person> getOwners() {
-		return owners;
-	}
-
-	public void setOwners(List<Person> owners) {
-		this.owners = owners;
-	}	
-
-	@Audited
-	public int getNumber() {
-		return number;
-	}
-
-	public void setNumber(int number) {
-		this.number = number;
-	}
-
-
-
-}
+package org.hibernate.envers.test.integration.entityNames.oneToManyNotAudited;
+import java.util.List;
+
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.RelationTargetAuditMode;
+
+/**
+ * @author Hern&aacute;n Chanfreau
+ * 
+ */
+
+public class Car {
+	
+	private long id;
+	
+	private int number;
+	
+	private List<Person> owners;
+
+	
+	public Car() { }
+
+	public Car(int number, List<Person> owners) {
+		this.number = number;
+		this.owners = owners;
+	}
+
+	
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	@Audited(targetAuditMode=RelationTargetAuditMode.NOT_AUDITED)
+	public List<Person> getOwners() {
+		return owners;
+	}
+
+	public void setOwners(List<Person> owners) {
+		this.owners = owners;
+	}	
+
+	@Audited
+	public int getNumber() {
+		return number;
+	}
+
+	public void setNumber(int number) {
+		this.number = number;
+	}
+
+
+
+}
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Person.java
similarity index 92%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Person.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Person.java
index 003fbc20f9..dbd112abd0 100644
--- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/Person.java
@@ -1,49 +1,49 @@
 package org.hibernate.envers.test.integration.entityNames.oneToManyNotAudited;
-
-
-/**
- * @author Hern&aacute;n Chanfreau
- * 
- */
-
-public class Person {
-	
-	private long id;
-	
-	private String name;
-	
-	private int age;
-	
-	public Person(){ }
-	
-	public Person(String name, int age){
-		this.name = name;
-		this.age = age;
-	}
-	
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public int getAge() {
-		return age;
-	}
-
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-}
+
+
+/**
+ * @author Hern&aacute;n Chanfreau
+ * 
+ */
+
+public class Person {
+	
+	private long id;
+	
+	private String name;
+	
+	private int age;
+	
+	public Person(){ }
+	
+	public Person(String name, int age){
+		this.name = name;
+		this.age = age;
+	}
+	
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+}
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/oneToManyNotAudited/ReadEntityWithAuditedCollectionTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Car.java
similarity index 93%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Car.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Car.java
index 86a046d6ba..5bdd0a8758 100644
--- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Car.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Car.java
@@ -1,60 +1,60 @@
-package org.hibernate.envers.test.integration.entityNames.singleAssociatedAudited;
-import org.hibernate.envers.Audited;
-
-/**
- * @author Hern&aacute;n Chanfreau
- * 
- */
-
-@Audited
-public class Car {
-	
-	private long id;
-	
-	private int number;
-	
-	private Person owner;
-
-    private Person driver;
-	
-	public Car() { }
-
-	public Car(int number, Person owner, Person driver) {
-		this.number = number;
-		this.owner = owner;
-        this.driver = driver;
-	}
-
-	
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public Person getOwner() {
-		return owner;
-	}
-
-	public void setOwner(Person owner) {
-		this.owner = owner;
-	}	
-
-	public int getNumber() {
-		return number;
-	}
-
-	public void setNumber(int number) {
-		this.number = number;
-	}
-
-    public Person getDriver() {
-        return driver;
-    }
-
-    public void setDriver(Person driver) {
-        this.driver = driver;
-    }
-}
+package org.hibernate.envers.test.integration.entityNames.singleAssociatedAudited;
+import org.hibernate.envers.Audited;
+
+/**
+ * @author Hern&aacute;n Chanfreau
+ * 
+ */
+
+@Audited
+public class Car {
+	
+	private long id;
+	
+	private int number;
+	
+	private Person owner;
+
+    private Person driver;
+	
+	public Car() { }
+
+	public Car(int number, Person owner, Person driver) {
+		this.number = number;
+		this.owner = owner;
+        this.driver = driver;
+	}
+
+	
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public Person getOwner() {
+		return owner;
+	}
+
+	public void setOwner(Person owner) {
+		this.owner = owner;
+	}	
+
+	public int getNumber() {
+		return number;
+	}
+
+	public void setNumber(int number) {
+		this.number = number;
+	}
+
+    public Person getDriver() {
+        return driver;
+    }
+
+    public void setDriver(Person driver) {
+        this.driver = driver;
+    }
+}
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Person.java
similarity index 93%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Person.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Person.java
index e4df1acad3..6758e13a2d 100644
--- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/Person.java
@@ -1,50 +1,50 @@
 package org.hibernate.envers.test.integration.entityNames.singleAssociatedAudited;
 import org.hibernate.envers.Audited;
-
-/**
- * @author Hern&aacute;n Chanfreau
- * 
- */
-
-@Audited
-public class Person {
-	
-	private long id;
-	
-	private String name;
-	
-	private int age;
-	
-	public Person(){ }
-	
-	public Person(String name, int age){
-		this.name = name;
-		this.age = age;
-	}
-	
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public int getAge() {
-		return age;
-	}
-
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-}
+
+/**
+ * @author Hern&aacute;n Chanfreau
+ * 
+ */
+
+@Audited
+public class Person {
+	
+	private long id;
+	
+	private String name;
+	
+	private int age;
+	
+	public Person(){ }
+	
+	public Person(String name, int age){
+		this.name = name;
+		this.age = age;
+	}
+	
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+}
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/ReadEntityAssociatedAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedAudited/SingleDomainObjectToMultipleTablesTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Car.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Car.java
similarity index 94%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Car.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Car.java
index d479e51c06..92d35dc096 100644
--- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Car.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Car.java
@@ -1,55 +1,55 @@
 package org.hibernate.envers.test.integration.entityNames.singleAssociatedNotAudited;
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.RelationTargetAuditMode;
-
-/**
- * @author Hern&aacute;n Chanfreau
- * 
- */
-
-public class Car {
-	
-	private long id;
-	
-	private int number;
-	
-	private Person owner;
-
-	
-	public Car() { }
-
-	public Car(int number, Person owner) {
-		this.number = number;
-		this.owner = owner;
-	}
-
-	
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	@Audited(targetAuditMode=RelationTargetAuditMode.NOT_AUDITED)
-	public Person getOwner() {
-		return owner;
-	}
-
-	public void setOwner(Person owner) {
-		this.owner = owner;
-	}	
-
-	@Audited
-	public int getNumber() {
-		return number;
-	}
-
-	public void setNumber(int number) {
-		this.number = number;
-	}
-
-
-
-}
+
+/**
+ * @author Hern&aacute;n Chanfreau
+ * 
+ */
+
+public class Car {
+	
+	private long id;
+	
+	private int number;
+	
+	private Person owner;
+
+	
+	public Car() { }
+
+	public Car(int number, Person owner) {
+		this.number = number;
+		this.owner = owner;
+	}
+
+	
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	@Audited(targetAuditMode=RelationTargetAuditMode.NOT_AUDITED)
+	public Person getOwner() {
+		return owner;
+	}
+
+	public void setOwner(Person owner) {
+		this.owner = owner;
+	}	
+
+	@Audited
+	public int getNumber() {
+		return number;
+	}
+
+	public void setNumber(int number) {
+		this.number = number;
+	}
+
+
+
+}
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Person.java
similarity index 92%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Person.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Person.java
index 6fee4a6802..14d79ff0d1 100644
--- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Person.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/Person.java
@@ -1,49 +1,49 @@
 package org.hibernate.envers.test.integration.entityNames.singleAssociatedNotAudited;
-
-
-/**
- * @author Hern&aacute;n Chanfreau
- * 
- */
-
-public class Person {
-	
-	private long id;
-	
-	private String name;
-	
-	private int age;
-	
-	public Person(){ }
-	
-	public Person(String name, int age){
-		this.name = name;
-		this.age = age;
-	}
-	
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public int getAge() {
-		return age;
-	}
-
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-}
+
+
+/**
+ * @author Hern&aacute;n Chanfreau
+ * 
+ */
+
+public class Person {
+	
+	private long id;
+	
+	private String name;
+	
+	private int age;
+	
+	public Person(){ }
+	
+	public Person(String name, int age){
+		this.name = name;
+		this.age = age;
+	}
+	
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+}
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/entityNames/singleAssociatedNotAudited/ReadEntityAssociatedNotAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/AbstractFlushTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/AbstractFlushTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/AbstractFlushTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/AbstractFlushTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddDel.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddDel.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddDel.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddDel.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddMod.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddMod.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddMod.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushAddMod.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/DoubleFlushModDel.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModDel.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/DoubleFlushModDel.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModDel.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/DoubleFlushModMod.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModMod.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/DoubleFlushModMod.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/DoubleFlushModMod.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/ManualFlush.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlush.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/ManualFlush.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlush.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/ManualFlushAutoCommitDisabled.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlushAutoCommitDisabled.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/flush/ManualFlushAutoCommitDisabled.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlushAutoCommitDisabled.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/hashcode/ChangingHashcode.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ChangingHashcode.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/hashcode/ChangingHashcode.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/ChangingHashcode.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/hashcode/WikiImage.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/WikiImage.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/hashcode/WikiImage.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/WikiImage.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/hashcode/WikiPage.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/WikiPage.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/hashcode/WikiPage.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/hashcode/WikiPage.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/ids/CompositeDateId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeDateId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/ids/CompositeDateId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeDateId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/ids/CompositeIds.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/ids/CompositeIds.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/CompositeIds.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/ids/DateId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/DateId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/ids/DateId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/DateId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildAuditing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/ChildAuditing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildAuditing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/ChildEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/ChildNullAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildNullAuditing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/ChildNullAuditing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ChildNullAuditing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ParentAuditing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/ParentAuditing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ParentAuditing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ParentEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/ParentEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/ParentEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildReferencing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildReferencing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ChildReferencing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ParentNotIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ParentNotIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ParentNotIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ParentNotIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ReferencedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ReferencedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/childrelation/ReferencedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildAuditing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildAuditing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildAuditing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/EmptyChildEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/ParentEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/ParentEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/emptychild/ParentEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/Address.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/Address.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/Address.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/Address.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/Contact.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/Contact.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/Contact.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/Contact.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/NotOwnedBidirectional.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/PersonalContact.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/PersonalContact.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/PersonalContact.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/notownedrelation/PersonalContact.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinAuditing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/primarykeyjoin/ChildPrimaryKeyJoinEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ChildIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ChildIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ChildIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Person.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Person.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Person.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/PolymorphicCollection.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/PolymorphicCollection.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/PolymorphicCollection.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ReferencedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ReferencedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ReferencedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/RightsSubject.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/RightsSubject.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/RightsSubject.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/RightsSubject.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Role.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Role.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Role.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Role.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/AbstractContainedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/AbstractSetEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/ContainedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/SetEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/SetEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/SetEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/SetEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/joined/relation/unidirectional/UnidirectionalDoubleAbstract.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractActivity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractActivity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractActivity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractActivity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractCheckActivity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractCheckActivity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractCheckActivity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/AbstractCheckActivity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/Activity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/Activity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/Activity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/Activity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/ActivityId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/ActivityId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/ActivityId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/ActivityId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/CheckInActivity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/CheckInActivity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/CheckInActivity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/CheckInActivity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/NormalActivity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/NormalActivity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/NormalActivity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/entities/NormalActivity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildAuditing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/ChildAuditing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildAuditing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/ChildEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ChildEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentAuditing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/ParentAuditing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentAuditing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/ParentEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/ParentEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ChildReferencing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ParentNotIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ParentNotIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ParentNotIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ParentNotIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ReferencedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ReferencedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/childrelation/ReferencedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ChildEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ChildEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ChildEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ClassTypeEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/DiscriminatorFormulaTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ParentEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ParentEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/discriminatorformula/ParentEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Address.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Address.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Address.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Address.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Contact.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Contact.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Contact.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/Contact.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/NotOwnedBidirectional.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/PersonalContact.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/PersonalContact.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/PersonalContact.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/notownedrelation/PersonalContact.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/relation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ChildIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/relation/ChildIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ChildIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/relation/ParentIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ParentIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/relation/ParentIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ParentIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/PolymorphicCollection.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/relation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ReferencedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/single/relation/ReferencedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/single/relation/ReferencedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildAuditing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildAuditing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildAuditing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ChildEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentAuditing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentAuditing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentAuditing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/ParentEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildReferencing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildReferencing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ChildReferencing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ParentNotIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/childrelation/ReferencedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Address.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Address.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Address.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Address.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Contact.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Contact.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Contact.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/Contact.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/NotOwnedBidirectional.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/notownedrelation/PersonalContact.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ChildIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ChildIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ChildIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ChildIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ParentIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ParentIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ParentIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ParentIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/PolymorphicCollection.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/PolymorphicCollection.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/PolymorphicCollection.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/PolymorphicCollection.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ReferencedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ReferencedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ReferencedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/tableperclass/relation/ReferencedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/components/Component1.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/Component1.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/components/Component1.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/Component1.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/components/ComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/ComponentTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/components/ComponentTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/ComponentTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/components/IComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/IComponent.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/components/IComponent.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/IComponent.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/components/InterfacesComponents.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/InterfacesComponents.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/components/InterfacesComponents.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/components/InterfacesComponents.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AbstractAllAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AuditedImplementor.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AuditedImplementor.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/AuditedImplementor.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/NonAuditedImplementor.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/SimpleInterface.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/SimpleInterface.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/SimpleInterface.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/SimpleInterface.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/joined/JoinedAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/joined/JoinedAllAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/joined/JoinedAllAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/joined/JoinedAllAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/subclass/SubclassAllAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/allAudited/union/UnionAllAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AuditedImplementor.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/NonAuditedImplementor.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/SimpleInterface.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/joined/JoinedPropertiesAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/subclass/SubclassPropertiesAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/union/UnionPropertiesAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AbstractPropertiesAudited2Test.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/AuditedImplementor.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/NonAuditedImplementor.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/SimpleInterface.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/joined/JoinedPropertiesAudited2Test.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/subclass/SubclassPropertiesAudited2Test.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited2/union/UnionPropertiesAudited2Test.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/relation/ISetRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/ISetRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/relation/ISetRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/ISetRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/relation/InterfacesRelation.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/InterfacesRelation.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/relation/InterfacesRelation.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/InterfacesRelation.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/relation/SetRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/BasicList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicList.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/BasicList.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicList.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/BasicMap.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicMap.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/BasicMap.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicMap.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/BasicWhereJoinTable.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicWhereJoinTable.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/BasicWhereJoinTable.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicWhereJoinTable.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/CustomComparatorEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/CustomComparatorEntityTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/CustomComparatorEntityTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/CustomComparatorEntityTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/biowned/BasicBiowned.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/biowned/BasicBiowned.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/biowned/BasicBiowned.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/biowned/BasicBiowned.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass2.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass2.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSubclass2.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSuperclass.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSuperclass.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/DetailSuperclass.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/Master.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/Master.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/Master.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/Master.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMap.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMap.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMap.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMap.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapFlush.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapFlush.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapFlush.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/ternary/TernaryMapFlush.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniList.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniList.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniList.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniMap.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniMap.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniMap.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniMap.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniSet.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniSet.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/BasicUniSet.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MIndexedListNotAuditedTarget.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/unidirectional/M2MRelationNotAuditedTarget.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ManyToOneOwning.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ManyToOneOwning.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ManyToOneOwning.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ManyToOneOwning.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/OneToManyOwned.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/OneToManyOwned.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/OneToManyOwned.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/bidirectional/OneToManyOwned.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/unidirectional/RelationNotAuditedTarget.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/unidirectional/RelationNotAuditedTarget.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/unidirectional/RelationNotAuditedTarget.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytoone/unidirectional/RelationNotAuditedTarget.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/AddDelTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/AddDelTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/AddDelTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/AddDelTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/GivenIdStrEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/GivenIdStrEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/GivenIdStrEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/GivenIdStrEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedCompositeCustom.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedCompositeCustom.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedCompositeCustom.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedCompositeCustom.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Address.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/Address.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Address.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/Address.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/MultipleAssociationsTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/MultipleAssociationsTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/MultipleAssociationsTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/MultipleAssociationsTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/Person.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Person.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/multiplerelations/Person.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/BasicNaming.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/BasicNaming.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/BasicNaming.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/BasicNaming.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/DetachedNamingTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/DetachedNamingTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/DetachedNamingTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/DetachedNamingTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/EstonianTableAlias.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/EstonianTableAlias.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/EstonianTableAlias.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/EstonianTableAlias.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/JoinNaming.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNaming.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/JoinNaming.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNaming.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/JoinNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/JoinNamingRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/JoinNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/JoinNamingRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/JoinNamingRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/NamingTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/NamingTestEntity1.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/NamingTestEntity1.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/NamingTestEntity1.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/OneToManyUnidirectionalNaming.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/OneToManyUnidirectionalNaming.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/OneToManyUnidirectionalNaming.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/OneToManyUnidirectionalNaming.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableNaming.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableNaming.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableNaming.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableNaming.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponent.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponent.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponent.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentNamingTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeComponentTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestAlternateEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableRangeTestEntitySuperClass.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/VersionsJoinTableTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/EmbIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/EmbIdNaming.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/EmbIdNaming.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/EmbIdNaming.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNaming.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNaming.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNaming.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinEmbIdNamingRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNaming.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNaming.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNaming.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/MulIdNaming.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/MulIdNaming.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/ids/MulIdNaming.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/MulIdNaming.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/quotation/QuotedFieldsTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notinsertable/NotInsertable.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertable.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notinsertable/NotInsertable.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertable.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notinsertable/NotInsertableTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertableTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notinsertable/NotInsertableTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/NotInsertableTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertable.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertable.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertable.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertable.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/ManyToOneNotInsertableEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notinsertable/manytoone/NotInsertableEntityType.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/NotInsertableEntityType.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notinsertable/manytoone/NotInsertableEntityType.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notinsertable/manytoone/NotInsertableEntityType.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicCollection.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicCollection.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicCollection.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicCollection.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicList.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSet.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicSet.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSet.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithEmbId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithEmbId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithEmbId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithEmbId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithMulId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithMulId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithMulId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithMulId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithNullsDelete.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithNullsDelete.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithNullsDelete.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicSetWithNullsDelete.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BidirectionalMapKey.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BidirectionalMapKey.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/BidirectionalMapKey.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BidirectionalMapKey.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/InverseSideChanges.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/RefEdMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefEdMapKeyEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/RefEdMapKeyEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefEdMapKeyEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/RefIngMapKeyEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefIngMapKeyEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/RefIngMapKeyEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/RefIngMapKeyEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedList.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedList.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedList.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSet.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSet.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSet.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithEmbId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithEmbId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithEmbId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithEmbId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithMulId.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithMulId.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithMulId.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicDetachedSetWithMulId.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/BasicJoinColumnSet.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleDetachedSet.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleDetachedSet.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleDetachedSet.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DoubleJoinColumnBidirectionalList.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalList.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalList.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalList.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/JoinColumnBidirectionalListWithInheritance.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/Node.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/hierarchy/Node.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/Node.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/hierarchy/Node.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass2.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass2.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSubclass2.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSuperclass.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSuperclass.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/DetailSuperclass.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/Master.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/Master.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/Master.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/Master.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BiRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional2.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional2.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/Bidirectional2.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalNoNulls.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalNoNulls.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalNoNulls.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/BidirectionalNoNulls.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiEmbIdRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/BiMulIdRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/EmbIdBidirectional.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/MulIdBidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/MulIdBidirectional.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/MulIdBidirectional.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/ids/MulIdBidirectional.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefEdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefEdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefEdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefEdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UniRefIngMulIdEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/Unidirectional.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/Unidirectional.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/Unidirectional.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/Unidirectional.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalMulIdWithNulls.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalWithNulls.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalWithNulls.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalWithNulls.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetoone/unidirectional/UnidirectionalWithNulls.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/primitive/PrimitiveAddDelete.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/primitive/PrimitiveAddDelete.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/primitive/PrimitiveAddDelete.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/primitive/PrimitiveAddDelete.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/properties/PropertiesTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/PropertiesTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/properties/PropertiesTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/PropertiesTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingFieldEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingFieldEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingFieldEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingFieldEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/proxy/AuditedCollectionProxyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/AuditedCollectionProxyTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/proxy/AuditedCollectionProxyTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/AuditedCollectionProxyTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/proxy/ProxyIdentifier.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/ProxyIdentifier.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/proxy/ProxyIdentifier.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/ProxyIdentifier.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/AggregateQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AggregateQuery.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/AggregateQuery.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/AggregateQuery.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/DeletedEntities.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/DeletedEntities.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/NullPropertyQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/NullPropertyQuery.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/NullPropertyQuery.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/NullPropertyQuery.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/OrderByLimitQuery.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/SimpleQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/SimpleQuery.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/ids/EmbIdOneToManyQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbIdOneToManyQuery.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/ids/EmbIdOneToManyQuery.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/EmbIdOneToManyQuery.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/Staff.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reference/BidirectionalReference.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/BidirectionalReference.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reference/BidirectionalReference.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/BidirectionalReference.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reference/GreetingPO.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/GreetingPO.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reference/GreetingPO.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/GreetingPO.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reference/GreetingSetPO.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/GreetingSetPO.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reference/GreetingSetPO.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reference/GreetingSetPO.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CountingRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CountingRevisionListener.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CountingRevisionListener.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CountingRevisionListener.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/Custom.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Custom.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/Custom.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Custom.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomBoxed.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxed.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomBoxed.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxed.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomBoxedRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxedRevEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomBoxedRevEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomBoxedRevEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomColumnMapping.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomColumnMapping.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomColumnMapping.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomColumnMapping.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomDate.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomDate.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomDate.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomDate.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomNoListener.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomNoListener.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomNoListener.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomNoListener.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomPropertyAccess.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomPropertyAccess.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/CustomPropertyAccess.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/CustomPropertyAccess.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/ExceptionListener.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ExceptionListener.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/ExceptionListener.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ExceptionListener.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/ExceptionListenerRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ExceptionListenerRevEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/ExceptionListenerRevEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ExceptionListenerRevEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/GloballyConfiguredRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/GloballyConfiguredRevListenerTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/GloballyConfiguredRevListenerTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/GloballyConfiguredRevListenerTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/Inherited.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Inherited.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/Inherited.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Inherited.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/Listener.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Listener.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/Listener.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/Listener.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/ListenerRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ListenerRevEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/ListenerRevEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/ListenerRevEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevEntityInheritanceChildAuditing.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/LongRevNumber.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumber.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/LongRevNumber.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumber.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/LongRevNumberRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumberRevEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/LongRevNumberRevEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/LongRevNumberRevEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/OverrideCustomRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideCustomRevListenerTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/OverrideCustomRevListenerTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideCustomRevListenerTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/OverrideDefaultRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideDefaultRevListenerTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/OverrideDefaultRevListenerTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideDefaultRevListenerTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/TestExceptionRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestExceptionRevisionListener.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/TestExceptionRevisionListener.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestExceptionRevisionListener.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/TestRevisionListener.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestRevisionListener.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/TestRevisionListener.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/TestRevisionListener.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/CustomTrackingEntitiesTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/EntityNamesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/EntityNamesTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/EntityNamesTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/EntityNamesTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/revfordate/RevisionForDate.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/revfordate/RevisionForDate.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/revfordate/RevisionForDate.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/revfordate/RevisionForDate.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity1.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity1.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity1.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity1.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity2.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity2.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIdTestEntity2.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/sameids/SameIds.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIds.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/sameids/SameIds.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/sameids/SameIds.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/BasicSecondary.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/BasicSecondary.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/BasicSecondary.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/BasicSecondary.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/NamingSecondary.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/NamingSecondary.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/NamingSecondary.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/NamingSecondary.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/SecondaryNamingTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/SecondaryNamingTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/SecondaryNamingTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/SecondaryNamingTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/SecondaryTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/SecondaryTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/SecondaryTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/SecondaryTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/ids/EmbIdSecondary.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/EmbIdSecondary.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/ids/EmbIdSecondary.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/EmbIdSecondary.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/ids/MulIdSecondary.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/MulIdSecondary.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/ids/MulIdSecondary.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/MulIdSecondary.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryEmbIdTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/secondary/ids/SecondaryMulIdTestEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/serialization/SerializingCollection.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/serialization/SerializingCollection.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/serialization/SerializingCollection.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/serialization/SerializingCollection.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyManyToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyManyToManyTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyManyToManyTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyManyToManyTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditClassOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditClassOverrideTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditClassOverrideTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditClassOverrideTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditPropertyOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditPropertyOverrideTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditPropertyOverrideTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditPropertyOverrideTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedBaseEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedBaseEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedBaseEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedSpecialEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedSpecialEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedSpecialEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedSpecialEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/BaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/BaseEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/BaseEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/BaseEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ExtendedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ExtendedBaseEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ExtendedBaseEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/ExtendedBaseEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/NotAuditedBaseEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/NotAuditedBaseEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/NotAuditedBaseEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/NotAuditedBaseEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/PropertyOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/PropertyOverrideEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/PropertyOverrideEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/PropertyOverrideEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/TransitiveOverrideEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/TransitiveOverrideEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/TransitiveOverrideEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditoverride/TransitiveOverrideEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/BabyCompleteEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/BabyCompleteEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/BabyCompleteEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/BabyCompleteEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildCompleteEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildCompleteEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildCompleteEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildCompleteEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildMultipleParentsEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildMultipleParentsEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildMultipleParentsEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildMultipleParentsEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildSingleParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildSingleParentEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildSingleParentEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ChildSingleParentEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ExplicitTransitiveChildEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/ImplicitTransitiveChildEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedGrandparentEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedGrandparentEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedGrandparentEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedGrandparentEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedParentEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedParentEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MappedParentEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/MultipleAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MultipleAuditParentsTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/MultipleAuditParentsTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/MultipleAuditParentsTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/SingleAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/SingleAuditParentsTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/SingleAuditParentsTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/SingleAuditParentsTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/TotalAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TotalAuditParentsTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/TotalAuditParentsTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TotalAuditParentsTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveAuditParentsTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveAuditParentsTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveAuditParentsTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveAuditParentsTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveParentEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveParentEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveParentEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditparents/TransitiveParentEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractPerformanceTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/AllPerformance.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AllPerformance.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/AllPerformance.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AllPerformance.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/ComplexInsertPerformance.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/ComplexInsertPerformance.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/ComplexInsertPerformance.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/performance/ComplexInsertPerformance.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/EvictAuditDataAfterCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/EvictAuditDataAfterCommitTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/EvictAuditDataAfterCommitTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/performance/EvictAuditDataAfterCommitTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/InsertsOneTransactionPerformance.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/InsertsOneTransactionPerformance.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/InsertsOneTransactionPerformance.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/performance/InsertsOneTransactionPerformance.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/InsertsPerformance.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/InsertsPerformance.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/InsertsPerformance.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/performance/InsertsPerformance.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/UpdatesPerformance.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/UpdatesPerformance.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/UpdatesPerformance.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/performance/UpdatesPerformance.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/complex/ChildEntity1.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/ChildEntity1.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/complex/ChildEntity1.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/ChildEntity1.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/complex/ChildEntity2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/ChildEntity2.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/complex/ChildEntity2.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/ChildEntity2.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/complex/RootEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/RootEntity.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/performance/complex/RootEntity.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/performance/complex/RootEntity.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/tools/TestTools.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/tools/TestTools.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/various/Address.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/various/Address.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/various/Address.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/various/Address.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/various/HsqlTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/various/HsqlTest.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/various/HsqlTest.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/various/HsqlTest.java
diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/various/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/various/Person.java
similarity index 100%
rename from hibernate-envers/src/matrix/java/org/hibernate/envers/test/various/Person.java
rename to hibernate-envers/src/test/java/org/hibernate/envers/test/various/Person.java
diff --git a/hibernate-envers/src/matrix/resources/hibernate.properties b/hibernate-envers/src/test/resources/hibernate.properties
similarity index 100%
rename from hibernate-envers/src/matrix/resources/hibernate.properties
rename to hibernate-envers/src/test/resources/hibernate.properties
diff --git a/hibernate-envers/src/matrix/resources/hibernate.test.session-cfg.xml b/hibernate-envers/src/test/resources/hibernate.test.session-cfg.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/hibernate.test.session-cfg.xml
rename to hibernate-envers/src/test/resources/hibernate.test.session-cfg.xml
diff --git a/hibernate-envers/src/matrix/resources/log4j.properties b/hibernate-envers/src/test/resources/log4j.properties
similarity index 100%
rename from hibernate-envers/src/matrix/resources/log4j.properties
rename to hibernate-envers/src/test/resources/log4j.properties
diff --git a/hibernate-envers/src/matrix/resources/mappings/components/UniquePropsEntity.hbm.xml b/hibernate-envers/src/test/resources/mappings/components/UniquePropsEntity.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/components/UniquePropsEntity.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/components/UniquePropsEntity.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/components/UniquePropsNotAuditedEntity.hbm.xml b/hibernate-envers/src/test/resources/mappings/components/UniquePropsNotAuditedEntity.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/components/UniquePropsNotAuditedEntity.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/components/UniquePropsNotAuditedEntity.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/entityNames/auditedEntity/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/auditedEntity/mappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/entityNames/auditedEntity/mappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/entityNames/auditedEntity/mappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/entityNames/manyToManyAudited/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/manyToManyAudited/mappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/entityNames/manyToManyAudited/mappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/entityNames/manyToManyAudited/mappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/entityNames/oneToManyAudited/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/oneToManyAudited/mappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/entityNames/oneToManyAudited/mappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/entityNames/oneToManyAudited/mappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/entityNames/oneToManyNotAudited/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/oneToManyNotAudited/mappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/entityNames/oneToManyNotAudited/mappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/entityNames/oneToManyNotAudited/mappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/entityNames/singleAssociatedAudited/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedAudited/mappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/entityNames/singleAssociatedAudited/mappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedAudited/mappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/entityNames/singleAssociatedNotAudited/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedNotAudited/mappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/entityNames/singleAssociatedNotAudited/mappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/entityNames/singleAssociatedNotAudited/mappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/interfaces/joinedAllAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/joinedAllAuditedMappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/interfaces/joinedAllAuditedMappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/interfaces/joinedAllAuditedMappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/interfaces/joinedPropertiesAudited2Mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAudited2Mappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/interfaces/joinedPropertiesAudited2Mappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAudited2Mappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/interfaces/joinedPropertiesAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAuditedMappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/interfaces/joinedPropertiesAuditedMappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/interfaces/joinedPropertiesAuditedMappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/interfaces/subclassAllAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/subclassAllAuditedMappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/interfaces/subclassAllAuditedMappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/interfaces/subclassAllAuditedMappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/interfaces/subclassPropertiesAudited2Mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAudited2Mappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/interfaces/subclassPropertiesAudited2Mappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAudited2Mappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/interfaces/subclassPropertiesAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAuditedMappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/interfaces/subclassPropertiesAuditedMappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/interfaces/subclassPropertiesAuditedMappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/interfaces/unionAllAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/unionAllAuditedMappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/interfaces/unionAllAuditedMappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/interfaces/unionAllAuditedMappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/interfaces/unionPropertiesAudited2Mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAudited2Mappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/interfaces/unionPropertiesAudited2Mappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAudited2Mappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/interfaces/unionPropertiesAuditedMappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAuditedMappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/interfaces/unionPropertiesAuditedMappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/interfaces/unionPropertiesAuditedMappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/manyToMany/inverseToSuperclass/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/manyToMany/inverseToSuperclass/mappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/manyToMany/inverseToSuperclass/mappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/manyToMany/inverseToSuperclass/mappings.hbm.xml
diff --git a/hibernate-envers/src/matrix/resources/mappings/oneToMany/inverseToSuperclass/mappings.hbm.xml b/hibernate-envers/src/test/resources/mappings/oneToMany/inverseToSuperclass/mappings.hbm.xml
similarity index 100%
rename from hibernate-envers/src/matrix/resources/mappings/oneToMany/inverseToSuperclass/mappings.hbm.xml
rename to hibernate-envers/src/test/resources/mappings/oneToMany/inverseToSuperclass/mappings.hbm.xml