Fixes bugs with new package names, finishes pom.xml