Structural changes needed for more straightforward package building