diff --git a/build.gradle b/build.gradle
index 844bba7283..8e42f5d361 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,10 +96,10 @@ libraries = [
 
 
         junit:          'junit:junit:' + junitVersion,
-        jpa_modelgen:   'org.hibernate:hibernate-jpamodelgen:1.1.1.Final',
+        jpa_modelgen:   'org.hibernate:hibernate-jpamodelgen:1.2.0.Final',
         shrinkwrap_api: 'org.jboss.shrinkwrap:shrinkwrap-api:1.0.0-beta-6',
         shrinkwrap:     'org.jboss.shrinkwrap:shrinkwrap-impl-base:1.0.0-beta-6',
-        validator:      'org.hibernate:hibernate-validator:4.2.0.Final',
+        validator:      'org.hibernate:hibernate-validator:4.3.0.Alpha1',
         h2:             'com.h2database:h2:' + h2Version,
 ]
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationMetadataSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationMetadataSourceProcessorImpl.java
index 0657c30e07..fda3e198e6 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationMetadataSourceProcessorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/AnnotationMetadataSourceProcessorImpl.java
@@ -41,6 +41,8 @@
 import org.hibernate.metamodel.internal.source.annotations.global.FetchProfileProcessor;
 import org.hibernate.metamodel.internal.source.annotations.global.QueryProcessor;
 import org.hibernate.metamodel.internal.source.annotations.global.TableProcessor;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.xml.PseudoJpaDotNames;
 import org.hibernate.metamodel.internal.source.annotations.xml.mocker.EntityMappingsMocker;
 import org.hibernate.metamodel.spi.MetadataSourceProcessor;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/EntityHierarchyBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/EntityHierarchyBuilder.java
index 4f99c0ce95..5f65847e29 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/EntityHierarchyBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/EntityHierarchyBuilder.java
@@ -40,6 +40,8 @@
 
 import org.hibernate.AnnotationException;
 import org.hibernate.internal.util.collections.CollectionHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.spi.binding.InheritanceType;
 import org.hibernate.metamodel.internal.source.annotations.entity.EntityClass;
 import org.hibernate.metamodel.internal.source.annotations.entity.RootEntitySourceImpl;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FetchProfileSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FetchProfileSourceImpl.java
index 9f76ba2d5b..2c85dc2020 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FetchProfileSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FetchProfileSourceImpl.java
@@ -30,7 +30,7 @@
 
 import org.hibernate.MappingException;
 import org.hibernate.annotations.FetchMode;
-import org.hibernate.metamodel.spi.binding.FetchProfile;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.spi.source.FetchProfileSource;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FilterDefinitionSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FilterDefinitionSourceImpl.java
index bed9807b93..eaa48ae293 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FilterDefinitionSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FilterDefinitionSourceImpl.java
@@ -28,6 +28,7 @@
 
 import org.jboss.jandex.AnnotationInstance;
 
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.spi.source.FilterDefinitionSource;
 import org.hibernate.metamodel.spi.source.FilterParameterSource;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FilterSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FilterSourceImpl.java
index f46b4a122e..541da96fd0 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FilterSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/FilterSourceImpl.java
@@ -25,6 +25,7 @@
 
 import org.jboss.jandex.AnnotationInstance;
 
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.spi.source.FilterSource;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/TypeDescriptorSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/TypeDescriptorSourceImpl.java
index eac438fcac..fbe289ed50 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/TypeDescriptorSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/TypeDescriptorSourceImpl.java
@@ -30,6 +30,7 @@
 
 import org.hibernate.AnnotationException;
 import org.hibernate.internal.util.StringHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.spi.source.TypeDescriptorSource;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AssociationAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AssociationAttribute.java
index 18fe20913a..6d7991c9a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AssociationAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AssociationAttribute.java
@@ -38,10 +38,10 @@
 import org.hibernate.annotations.NotFoundAction;
 import org.hibernate.engine.FetchStyle;
 import org.hibernate.mapping.PropertyGeneration;
-import org.hibernate.metamodel.internal.source.annotations.EnumConversionHelper;
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.EnumConversionHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.attribute.type.AttributeTypeResolver;
 import org.hibernate.metamodel.internal.source.annotations.attribute.type.AttributeTypeResolverImpl;
 import org.hibernate.metamodel.internal.source.annotations.attribute.type.CompositeAttributeTypeResolver;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AttributeNature.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AttributeNature.java
index 87ad491717..28fa60f07b 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AttributeNature.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AttributeNature.java
@@ -25,8 +25,8 @@
 
 import org.jboss.jandex.DotName;
 
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 
 /**
  * An enum defining the type of a mapped attribute.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AttributeOverride.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AttributeOverride.java
index 9343f7c64b..7249c9b627 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AttributeOverride.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/AttributeOverride.java
@@ -27,8 +27,8 @@
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.internal.util.StringHelper;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 
 /**
  * Contains the information about a single {@link javax.persistence.AttributeOverride}. Instances of this class
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/BasicAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/BasicAttribute.java
index c462f8b89b..f934531822 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/BasicAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/BasicAttribute.java
@@ -39,12 +39,12 @@
 import org.hibernate.annotations.SourceType;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.mapping.PropertyGeneration;
+import org.hibernate.metamodel.internal.source.annotations.util.EnumConversionHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.spi.binding.IdGenerator;
 import org.hibernate.metamodel.spi.source.MappingException;
-import org.hibernate.metamodel.internal.source.annotations.EnumConversionHelper;
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.attribute.type.AttributeTypeResolver;
 import org.hibernate.metamodel.internal.source.annotations.attribute.type.AttributeTypeResolverImpl;
 import org.hibernate.metamodel.internal.source.annotations.attribute.type.CompositeAttributeTypeResolver;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/Column.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/Column.java
index 99ac8a8da2..891ffbe267 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/Column.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/Column.java
@@ -27,7 +27,7 @@
 import org.jboss.jandex.AnnotationValue;
 
 import org.hibernate.AssertionFailure;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 
 /**
  * Container for the properties defined by {@link javax.persistence.Column} or {@link javax.persistence.JoinColumn}.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/MappedAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/MappedAttribute.java
index a752ceed7f..d8438e17d6 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/MappedAttribute.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/MappedAttribute.java
@@ -32,9 +32,9 @@
 import org.jboss.jandex.DotName;
 
 import org.hibernate.mapping.PropertyGeneration;
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.attribute.type.AttributeTypeResolver;
 import org.hibernate.metamodel.internal.source.annotations.entity.EntityBindingContext;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/SingularAttributeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/SingularAttributeSourceImpl.java
index 17b7c34f57..b7eb5ac068 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/SingularAttributeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/SingularAttributeSourceImpl.java
@@ -28,6 +28,7 @@
 import java.util.List;
 
 import org.hibernate.mapping.PropertyGeneration;
+import org.hibernate.metamodel.internal.source.annotations.attribute.type.ExplicitHibernateTypeSourceImpl;
 import org.hibernate.metamodel.spi.source.ExplicitHibernateTypeSource;
 import org.hibernate.metamodel.spi.source.MetaAttributeSource;
 import org.hibernate.metamodel.spi.source.RelationalValueSource;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/ToOneAttributeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/ToOneAttributeSourceImpl.java
index 05f346778b..3a32308fac 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/ToOneAttributeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/ToOneAttributeSourceImpl.java
@@ -29,7 +29,7 @@
 import org.hibernate.engine.FetchStyle;
 import org.hibernate.engine.FetchTiming;
 import org.hibernate.engine.spi.CascadeStyle;
-import org.hibernate.metamodel.internal.source.annotations.EnumConversionHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.EnumConversionHelper;
 import org.hibernate.metamodel.spi.source.SingularAttributeNature;
 import org.hibernate.metamodel.spi.source.ToOneAttributeSource;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/AttributeTypeResolverImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/AttributeTypeResolverImpl.java
index c064e7c638..912bfdb748 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/AttributeTypeResolverImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/AttributeTypeResolverImpl.java
@@ -30,8 +30,8 @@
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationValue;
 
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.attribute.MappedAttribute;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/EnumeratedTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/EnumeratedTypeResolver.java
index fe8d400065..cf2e12ab86 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/EnumeratedTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/EnumeratedTypeResolver.java
@@ -32,8 +32,8 @@
 
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.attribute.MappedAttribute;
 import org.hibernate.type.EnumType;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/ExplicitHibernateTypeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/ExplicitHibernateTypeSourceImpl.java
similarity index 99%
rename from hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/ExplicitHibernateTypeSourceImpl.java
rename to hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/ExplicitHibernateTypeSourceImpl.java
index 5c3fe57dda..9b3f147728 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/ExplicitHibernateTypeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/ExplicitHibernateTypeSourceImpl.java
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.metamodel.internal.source.annotations.attribute;
+package org.hibernate.metamodel.internal.source.annotations.attribute.type;
 
 import java.util.Map;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/LobTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/LobTypeResolver.java
index 6cfcd8f62e..a389a43ddf 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/LobTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/LobTypeResolver.java
@@ -33,8 +33,8 @@
 import org.jboss.jandex.AnnotationInstance;
 
 import org.hibernate.AssertionFailure;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.attribute.MappedAttribute;
 import org.hibernate.type.CharacterArrayClobType;
 import org.hibernate.type.PrimitiveCharacterArrayClobType;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/TemporalTypeResolver.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/TemporalTypeResolver.java
index 1ac11f84ba..c26ca9aefd 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/TemporalTypeResolver.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/type/TemporalTypeResolver.java
@@ -32,12 +32,10 @@
 
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
-import org.hibernate.annotations.SourceType;
 import org.hibernate.cfg.NotYetImplementedException;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.attribute.BasicAttribute;
-import org.hibernate.metamodel.internal.source.annotations.attribute.MappedAttribute;
 import org.hibernate.type.StandardBasicTypes;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/ConfiguredClass.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/ConfiguredClass.java
index 8f8bcc5bd7..2c8c68dd92 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/ConfiguredClass.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/ConfiguredClass.java
@@ -55,12 +55,12 @@
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.NotYetImplementedException;
 import org.hibernate.metamodel.internal.source.annotations.attribute.PluralAssociationAttribute;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.ReflectionHelper;
 import org.hibernate.metamodel.spi.source.MappingException;
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContext;
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
-import org.hibernate.metamodel.internal.source.annotations.ReflectionHelper;
 import org.hibernate.metamodel.internal.source.annotations.attribute.AssociationAttribute;
 import org.hibernate.metamodel.internal.source.annotations.attribute.AttributeNature;
 import org.hibernate.metamodel.internal.source.annotations.attribute.AttributeOverride;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableClass.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableClass.java
index 524ae4d7ac..cb3cf3e402 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableClass.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableClass.java
@@ -29,8 +29,8 @@
 import org.jboss.jandex.ClassInfo;
 
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContext;
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 
 /**
  * Represents the information about an entity annotated with {@code @Embeddable}.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableHierarchy.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableHierarchy.java
index 0ae5a0c8fc..db136f72d2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableHierarchy.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableHierarchy.java
@@ -33,8 +33,8 @@
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContext;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 
 /**
  * Contains information about the access and inheritance type for all classes within a class hierarchy.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EntityClass.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EntityClass.java
index a3c5621bc8..a71d7bbba2 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EntityClass.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EntityClass.java
@@ -59,9 +59,9 @@
 import org.hibernate.engine.OptimisticLockStyle;
 import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle;
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContext;
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.attribute.Column;
 import org.hibernate.metamodel.internal.source.annotations.attribute.FormulaValue;
 import org.hibernate.metamodel.internal.source.annotations.xml.PseudoJpaDotNames;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileProcessor.java
index 451925f917..985b68fcd7 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileProcessor.java
@@ -32,12 +32,12 @@
 import org.hibernate.MappingException;
 import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.FetchProfiles;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.spi.binding.FetchProfile;
 import org.hibernate.metamodel.spi.binding.FetchProfile.Fetch;
 import org.hibernate.metamodel.spi.source.MetadataImplementor;
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContext;
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
 
 /**
  * Binds fetch profiles found in annotations.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/IdGeneratorProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/IdGeneratorProcessor.java
index 6f24ed0266..9c92ec97a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/IdGeneratorProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/IdGeneratorProcessor.java
@@ -43,13 +43,13 @@
 import org.hibernate.id.enhanced.TableGenerator;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.StringHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.EnumConversionHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.spi.binding.IdGenerator;
 import org.hibernate.metamodel.spi.source.MetadataImplementor;
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContext;
-import org.hibernate.metamodel.internal.source.annotations.EnumConversionHelper;
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
 
 /**
  * Binds {@link SequenceGenerator}, {@link javax.persistence.TableGenerator}, {@link GenericGenerator}, and
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/QueryProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/QueryProcessor.java
index 1089e69916..cd86ff6962 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/QueryProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/QueryProcessor.java
@@ -45,11 +45,11 @@
 import org.hibernate.engine.spi.NamedSQLQueryDefinition;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.StringHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.spi.source.MetadataImplementor;
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContext;
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
 
 /**
  * Binds {@link NamedQuery}, {@link NamedQueries}, {@link NamedNativeQuery}, {@link NamedNativeQueries},
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/TableProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/TableProcessor.java
index aff73c0eb6..9abd6e7800 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/TableProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/global/TableProcessor.java
@@ -32,8 +32,8 @@
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContext;
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.HibernateDotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.spi.relational.Column;
 import org.hibernate.metamodel.spi.relational.Index;
 import org.hibernate.metamodel.spi.relational.ObjectName;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/EnumConversionHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/EnumConversionHelper.java
similarity index 98%
rename from hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/EnumConversionHelper.java
rename to hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/EnumConversionHelper.java
index 6620f24db3..8e70194738 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/EnumConversionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/EnumConversionHelper.java
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.metamodel.internal.source.annotations;
+package org.hibernate.metamodel.internal.source.annotations.util;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/HibernateDotNames.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/HibernateDotNames.java
similarity index 99%
rename from hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/HibernateDotNames.java
rename to hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/HibernateDotNames.java
index 22d37194dc..cab5df5a3e 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/HibernateDotNames.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/HibernateDotNames.java
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.metamodel.internal.source.annotations;
+package org.hibernate.metamodel.internal.source.annotations.util;
 
 import org.jboss.jandex.DotName;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/JPADotNames.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JPADotNames.java
similarity index 99%
rename from hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/JPADotNames.java
rename to hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JPADotNames.java
index c790a38d3a..f5b486e47a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/JPADotNames.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JPADotNames.java
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.metamodel.internal.source.annotations;
+package org.hibernate.metamodel.internal.source.annotations.util;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/JandexHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelper.java
similarity index 99%
rename from hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/JandexHelper.java
rename to hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelper.java
index dbc897d328..0fd766fc62 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/JandexHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelper.java
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.metamodel.internal.source.annotations;
+package org.hibernate.metamodel.internal.source.annotations.util;
 
 import java.beans.Introspector;
 import java.io.IOException;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/ReflectionHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/ReflectionHelper.java
similarity index 97%
rename from hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/ReflectionHelper.java
rename to hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/ReflectionHelper.java
index 2cec3f591a..5eebed3df0 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/ReflectionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/ReflectionHelper.java
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
  */
-package org.hibernate.metamodel.internal.source.annotations;
+package org.hibernate.metamodel.internal.source.annotations.util;
 
 import java.beans.Introspector;
 import java.lang.reflect.Field;
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/package.html b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/package.html
new file mode 100755
index 0000000000..2e9418fc1c
--- /dev/null
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/util/package.html
@@ -0,0 +1,33 @@
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ Copyright (c) 2012, Red Hat Middleware LLC or third-party contributors as
+  ~ indicated by the @author tags or express copyright attribution
+  ~ statements applied by the authors.  All third-party contributions are
+  ~ distributed under license by Red Hat Middleware LLC.
+  ~
+  ~ This copyrighted material is made available to anyone wishing to use, modify,
+  ~ copy, or redistribute it subject to the terms and conditions of the GNU
+  ~ Lesser General Public License, as published by the Free Software Foundation.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+  ~ for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License
+  ~ along with this distribution; if not, write to:
+  ~ Free Software Foundation, Inc.
+  ~ 51 Franklin Street, Fifth Floor
+  ~ Boston, MA  02110-1301  USA
+  ~
+  -->
+
+<html>
+<head></head>
+<body>
+<p>
+    Utility classes for processing the annotation configuration.
+</p>
+</body>
+</html>
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/filter/IndexedAnnotationFilter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/filter/IndexedAnnotationFilter.java
index 7822536a05..203fc03415 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/filter/IndexedAnnotationFilter.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/filter/IndexedAnnotationFilter.java
@@ -26,7 +26,7 @@
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.DotName;
 
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 import org.hibernate.metamodel.internal.source.annotations.xml.mocker.IndexBuilder;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/filter/NameTargetAnnotationFilter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/filter/NameTargetAnnotationFilter.java
index d7ae34e43e..da0542bab1 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/filter/NameTargetAnnotationFilter.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/filter/NameTargetAnnotationFilter.java
@@ -30,8 +30,8 @@
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.DotName;
 
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 import org.hibernate.metamodel.internal.source.annotations.xml.mocker.MockHelper;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
 
 /**
  * @author Strong Liu
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AbstractMocker.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AbstractMocker.java
index 2802d2c21c..15b89acf6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AbstractMocker.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AbstractMocker.java
@@ -33,7 +33,7 @@
 
 import org.hibernate.internal.jaxb.mapping.orm.JaxbAccessType;
 import org.hibernate.internal.jaxb.mapping.orm.JaxbUniqueConstraint;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 
 /**
  * Base class for the mock jandex annotations created from orm.xml.
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AccessHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AccessHelper.java
index bbf3c91db2..36e30f5135 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AccessHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/AccessHelper.java
@@ -37,8 +37,8 @@
 import org.hibernate.MappingException;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.jaxb.mapping.orm.JaxbAccessType;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.xml.PseudoJpaDotNames;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/DefaultConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/DefaultConfigurationHelper.java
index f302fee577..1f55d5d603 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/DefaultConfigurationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/DefaultConfigurationHelper.java
@@ -38,8 +38,8 @@
 import org.hibernate.internal.jaxb.mapping.orm.JaxbMappedSuperclass;
 import org.hibernate.internal.jaxb.mapping.orm.JaxbTable;
 import org.hibernate.internal.util.StringHelper;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.xml.filter.IndexedAnnotationFilter;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/GlobalAnnotations.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/GlobalAnnotations.java
index b7fb3d5e2d..56adc2b3d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/GlobalAnnotations.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/GlobalAnnotations.java
@@ -46,8 +46,8 @@
 import org.hibernate.internal.jaxb.mapping.orm.JaxbSqlResultSetMapping;
 import org.hibernate.internal.jaxb.mapping.orm.JaxbTableGenerator;
 import org.hibernate.internal.util.StringHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 import org.hibernate.metamodel.spi.source.MappingException;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
 
 /**
  * @author Strong Liu
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/MockHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/MockHelper.java
index 4e166cb081..64822d7529 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/MockHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/MockHelper.java
@@ -42,7 +42,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.internal.jaxb.mapping.orm.JaxbCascadeType;
 import org.hibernate.internal.util.StringHelper;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.service.classloading.spi.ClassLoaderService;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java
index e723373779..3b8771f070 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/FetchProfileBinderTest.java
@@ -34,7 +34,7 @@
 import org.hibernate.metamodel.MetadataSources;
 import org.hibernate.metamodel.internal.MetadataImpl;
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContextImpl;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.service.ServiceRegistryBuilder;
 import org.hibernate.service.classloading.spi.ClassLoaderService;
 import org.hibernate.service.internal.StandardServiceRegistryImpl;
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java
index f826f29b0c..da888279e1 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/global/QueryBinderTest.java
@@ -37,7 +37,7 @@
 import org.hibernate.metamodel.MetadataSources;
 import org.hibernate.metamodel.internal.MetadataImpl;
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContextImpl;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
+import org.hibernate.metamodel.internal.source.annotations.util.JandexHelper;
 import org.hibernate.service.ServiceRegistryBuilder;
 import org.hibernate.service.classloading.spi.ClassLoaderService;
 import org.hibernate.service.internal.StandardServiceRegistryImpl;
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java
index b8e73b18fe..566c8773e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/BaseAnnotationIndexTestCase.java
@@ -35,7 +35,6 @@
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContext;
 import org.hibernate.metamodel.internal.source.annotations.AnnotationBindingContextImpl;
 import org.hibernate.metamodel.internal.source.annotations.EntityHierarchyBuilder;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
 import org.hibernate.metamodel.internal.source.annotations.entity.EmbeddableHierarchy;
 import org.hibernate.metamodel.spi.source.EntityHierarchy;
 import org.hibernate.service.ServiceRegistryBuilder;
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java
index 2fbc4e8138..e78fac1ef8 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/util/JandexHelperTest.java
@@ -43,9 +43,6 @@
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.NamedNativeQuery;
-import org.hibernate.metamodel.internal.source.annotations.HibernateDotNames;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
-import org.hibernate.metamodel.internal.source.annotations.JandexHelper;
 import org.hibernate.service.ServiceRegistryBuilder;
 import org.hibernate.service.classloading.spi.ClassLoaderService;
 import org.hibernate.service.internal.StandardServiceRegistryImpl;
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/BasicMockerTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/BasicMockerTest.java
index 82e485bf4c..694917b4aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/BasicMockerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/BasicMockerTest.java
@@ -33,7 +33,7 @@
 import org.hibernate.internal.jaxb.mapping.orm.JaxbEntity;
 import org.hibernate.internal.jaxb.mapping.orm.JaxbGeneratedValue;
 import org.hibernate.internal.jaxb.mapping.orm.JaxbId;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java
index 1b81e5d29a..7dbd6741dc 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/DefaultConfigurationHelperTest.java
@@ -19,7 +19,7 @@
 import org.junit.Test;
 
 import org.hibernate.internal.jaxb.mapping.orm.JaxbEntity;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/EntityListenerTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/EntityListenerTest.java
index fe6f990e4a..fc50ac24a3 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/EntityListenerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/EntityListenerTest.java
@@ -28,7 +28,7 @@
 import org.jboss.jandex.Index;
 import org.junit.Test;
 
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 import org.hibernate.metamodel.internal.source.annotations.xml.PseudoJpaDotNames;
 
 import static org.junit.Assert.assertEquals;
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/OverrideTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/OverrideTest.java
index 1ad0e29c84..c58f31b5a4 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/OverrideTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/xml/mocker/OverrideTest.java
@@ -33,7 +33,7 @@
 import org.junit.Test;
 
 import org.hibernate.internal.jaxb.mapping.orm.JaxbEntity;
-import org.hibernate.metamodel.internal.source.annotations.JPADotNames;
+import org.hibernate.metamodel.internal.source.annotations.util.JPADotNames;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;