Refactored Hibernate xml files