moved composite components into ext