Moving some things around for config reasons