Final bit of renaming of packages