jpa data packages refactoring