Reorg all the composition-related stuff