Move `ObjectStorage` class one level up in hierarchy

An app should not have no idea about type of Storage below the object storage.