Restructuring the package hierarchy