Renamed lister and reader. Made driver dependency injectable.