Reorganized component structure