Feature/mavenized