Changed file names and made driver a module.