Mavenized and ready to fix dependencied