Some more package re-structuring.