reorganized components