Mavenization
Mavenization: improved build