Reorg to be more composer compatible (future growth)