Reorganize driver structure
for-compiling changes