Finish config restructuring