Consolidate both Store implementations into one file
For #4-fewer-api-ops