mods for Orphans
Fixed bug with subPackages