Refactoring POM's and .gitignore