Updated project structure and pom file to build project correctly