Configuration restructured