Muted the storage layer for now, and renamed the rest of the
storage files to match style.