Provide InputStream abstraction
Turn buffer into package, add FileInput stream