I’d say moving the stuff from org.hibernate.metamodel.model.convert (with package structure) under org.hibernate.type.descriptor.converter and move AttributeConverterMutabilityPlanImpl into the newly moved org.hibernate.type.descriptor.converter.internal