Moving stuff around to conform with configs script