major refactoring and removing neo4j.. for now..