Massive refactoring
Forgot to change config file name back