progress on refactoring domain models and hibernate mappings