Simplifying config files

Well, the tests all pass!