Move PlanDescription et al to the Cypher top-module