chore #6 mavenize