Add Storage system. Remove InputStream classes, we're going to use std::istream's.