Updates to driver organisation