- seperate "drivers" from the rest
- remove the unneeded typedefs