Refactor configs

Fixes Issue #2, and #3 as well as other fixes

This does require users to manually update the config to the new format.