A follow on task here (that I wont tackle today) will be to clean up:

• org.hibernate.cfg.Mappings
• org.hibernate.cfg.ExtendedMappings
• Binders etal in org.hibernate.cfg
• all of org.hibernate.mapping