Refactoring files (private accessors, renaming, changes to hbm.xml)