Restructured settings