Refactored main package name
Seperated 2 persistence units from 1 file to 2 files