Part 1 of renaming packages
Part 2 of renaming packages