Simplified project and mavenized it