Refactor customizer to use more logical groupings.