update pom.xml and .gitignore to be consistent with new project structure