Moved the driver reading into its own file.