Use a map of maps to define filestores, rather than a list of maps

Use a map of maps to define filestores, rather than a list of maps #880