packages restructuring