Fixed project structure
Upgraded pom.xml