Revert "Changed DiskSpace and KeyStorage"

This reverts commit e4e808627f4226873a373763f7b6136c10cfa762, reversing
changes made to efad24446f673a1b08cbe0db8a09f89cb1e0b518.