moved components to better folders