corrected the package hierarchy