Move internal Cypher classes into internal package