Lots of turn work
Attempt at custom JPA queries (requires more work)
Controllers renamed