fixed pom files and project structure