Refactor.
Refactor.
Moved Neo4j classes to own package.