Refactoring, the config is now in its own file.