restructuring bundle package layout