Mavenized project, fixed build issues