Changed project structure
Mavenized project