First stage restructuring. Move existing crap into new hierarchy.