CORE: Refactor entities out of CZone and into another class