re-work data source into a typeclass so that we can read from things other than files / ByteStrings, also fixed some deprecation warnings