Switch back to hibernate - Introduce Akka - Misc. refactorings