Mbst 9893 more granular uploads

Have been thinking about this for a few minutes. I'm not sure whether I prefer the consistency in naming, or not duplicating the word 'store' ([x]Store.store seems superfluous to me).