initial restructuring of packages