Refactor core-persistence pom