Move things around a bit, del deprecated sections