moving non-configs out of config