Packages renaming to fit the new directory hierarchie