Reorder components to match(?) graphics subsystem