Moved components into sorted folders