Moved location/store abstractions to notion.

@nhibberd can you double check this - but everything should be what you can see in notion.