Mavenized

rebuilt for maven