Added new java files + added hibernate mapping, not tested yet