Move the files into the "main" directory to allow for testing.
Try to integrate the JPA persistence