refactored hibernate mapping files