Updated the package hierarchy