Renamed, changed calculations for models, loaders

Changed models and loading to make percent and per capita easier to work with
and ran a few migrations.