moved components to core instead