Mavenize
Refactor package name
Code cleanup