Moving config stuff around