Added ValueStorage stuff
Made changes for DiskSpace
Renamed the Storage interface (to Space)
Merge branch 'KeyStorage'