restructured packages