Moved uicomponent stuff into different package.