Merge pull request #169 from lowjoel/fix-datastore
Restructure the data store.

(main@e57bcc4734e33a48a1ac68d2ea6f71a04ab04cf0)