Repackaging to be more in line with Clean architecture
pom updated