Updated package naming and fixed artifactIds
Merge branch 'master' of https://github.com/pnsantos/maven-build-tools