changed file structure and fixed pom file