Re-organize components structure.