Updated storage files to new format with moar data
Merge remote-tracking branch 'origin/master'