Refactor configuration files to be more logical
More refactoring! One day I will stop