Reorg to separate Entity from Element