Reorganizing drivers