moved components into single files