Match the file locations to the package names and some minor pom and git changes