Revert "Revert "Storage Modules""

This reverts commit 5aea50be4497f296f14bc526ee880e42f785dd5f.
Revert "Revert "Revert "Storage Modules"""

This reverts commit b00fcd91c3786296172922c9f541595ea19e22d8.
Model deprecation / consolidation