Reorganised Neo4j code