Add relation annotations
Add named queries
Rename entity package