packages restructured