Rebuilt project structure and moved JPA config from persistence.xml to Spring context