adjusted artifactId's and .gitignore