Added ui module component
Reorganizing after merge