Revert "Complete storage system"

This reverts commit a1a49777f4237251752564da294aedc1aea7bcc3.
Revert "Complete storage system"

This reverts commit a1a49777f4237251752564da294aedc1aea7bcc3.
fixing files that should have been ignore in the last commit