Restructure data for DB queries.
Merge branch 'master' of github.com:hackforwesternmass/uppd