Moved things around, refactored configuration manager