Storage cleanup

Separate IO and Storage capabilities to single modules.
Lot of changes !