Mavenized the code