Fixing package names and adding excludes to the pom.xml for the parts of the collections framework that followed over