Move packages, refactor references