moved Entity class to model.support package
refactored mappings