Fix config file heirarchy

see commit message.