Renamed HybridStorageLayer as HybridStorage.
Added partial classes for HybridStorage.