Adjusted the package hierarchy