Added caching with ehcache, moved to Hikari for connection pool
Fixes to be compatible with new project structure