hibernate mapping change

Hiber mapping changed from XML to Annotations because they are more
readable as they are in the same file