Hierarchy clean up; package renaming