reorganized driver header files