moved components to cmp