Moving config settings to more logical places