Lots of refactoring to match what I pushed to the "next" branch for prod
Completely re-worked the Config class
Moved tests to the test dir as per the main fork