Removed irrelevant classes from source
Set hibernate version back to same as that being used in S&A
Introduced annotation to generate uniqueness constraints
Cleaned up a bit