Fixed package hierarchy.