Revert "Single storage to single file convertion."

This reverts commit 77b29b300af434582f97c7371efae88aa0ee6c9f.