Restructure to play nice with other .config stuff