Mavenize project
Some more work