Moved directories around so driver extras are in drivers directory