Cleaning up directory structure.
Cleaning up directory structure1.
Playing with DataNucleus JPA.
Changing structure.
Working version