modification of file structure + Neo4j integration with Model(not perfect)