Mavenization: improved build