Update structure of file storage to a file type map

This will make is easier to get a file of a specifc type and have ordering between files of different types either for timeline iteration or displaying.

Test: Make sure data views always show in the same order and everything else still works.
Change-Id: I5e3a728ee5e5eb1d56a72cffdd9203dcf2dfb347