Huge refactoring of the storage systems