Reorganize tree and composer added