Finished changing the files for Storage