Corrected package hierarchy.