Adjusted package hierarchy.