Revert "Storage Modules"

This reverts commit 06496f269581f6f3c940449e30797bb9549bb6ce.