Reorganize Customizer code to reflect UI reorganization