Moved inputstreams to class namespace