Reorganize Customer components.