Packages hierarchy corrected