Namespacing the storage functions, updating everywhere that uses them.

Also updated the globals declarations at the top of all the files to only declare the ones actually used for that file.