Mavenize
Refactor package name