Refucktored Storages to StorageAdapters.
Wrapped storage adapters with storage.