diff --git a/src/datasets.js b/src/common/datasets.js
similarity index 100%
rename from src/datasets.js
rename to src/common/datasets.js
diff --git a/src/display/graph.ts b/src/common/graph.ts
similarity index 100%
rename from src/display/graph.ts
rename to src/common/graph.ts
diff --git a/src/display/components/nodeinfo/neighbors.tsx b/src/display/components/nodeinfo/neighbors.tsx
index 02c2839a9e9c6185fbfcbea17b77f6932d6166bd..b7f713ec0c1e237e711b03a2845144daac357c42 100644
--- a/src/display/components/nodeinfo/neighbors.tsx
+++ b/src/display/components/nodeinfo/neighbors.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { NodeData } from "../../graph";
+import { NodeData } from "../../../common/graph";
 import FancyScrollbar from "../fancyscrollbar";
 import Collapsible from "../collapsible";
 
diff --git a/src/display/components/nodeinfo/nodeinfobar.tsx b/src/display/components/nodeinfo/nodeinfobar.tsx
index 5816bb839ad71a1446e667745d930150a7ce32da..9d98adda3e33ac859d861a242700ad8682c9131c 100644
--- a/src/display/components/nodeinfo/nodeinfobar.tsx
+++ b/src/display/components/nodeinfo/nodeinfobar.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 
 import "./nodeinfobar.css";
-import { NodeData } from "../../graph";
+import { NodeData } from "../../../common/graph";
 import TitleArea from "./titlearea";
 import FancyScrollbar from "../fancyscrollbar";
 import MediaArea from "./mediaarea";
diff --git a/src/display/components/searchbar.tsx b/src/display/components/searchbar.tsx
index 2740f0f7326d4e1f30a1249ebe174df477392aa1..4016a54d31950856711ec66a49c06c1de72159ee 100644
--- a/src/display/components/searchbar.tsx
+++ b/src/display/components/searchbar.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, useState } from "react";
 
 import "./searchbar.css";
-import { NodeData } from "../graph";
+import { NodeData } from "../../common/graph";
 
 interface SearchBarProps {
     minified: boolean;
diff --git a/src/display/display.tsx b/src/display/display.tsx
index bb220f2b8bbc7b61d46f275437bf95fce1c2e913..71449a48ff9a651d37fc30b83f30d646d6402a2e 100644
--- a/src/display/display.tsx
+++ b/src/display/display.tsx
@@ -5,12 +5,11 @@ import PropTypes, { InferType } from "prop-types";
 import "./display.css";
 import { GraphNode, GraphRenderer } from "./renderer";
 import * as Helpers from "./helpers";
-import Graph, { NodeData } from "./graph";
-import { loadGraphJson } from "../datasets";
+import Graph, { NodeData } from "../common/graph";
+import { loadGraphJson } from "../common/datasets";
 import NodeInfoBar from "./components/nodeinfo/nodeinfobar";
 import FilterMenu from "./components/nodefilter/filtermenu";
 import SearchBar from "./components/searchbar";
-import { graph } from "../editor/js/editor";
 
 /**
  * This component manages and renders a 3d-force-graph with additional menus to navigate, filter and view information on nodes.
diff --git a/src/display/renderer.tsx b/src/display/renderer.tsx
index 9e0b93e536e7bb36867dae5d3814f7a9fbd2237a..a1ac0494ec01e0f002013978dc743b51b2d1367b 100644
--- a/src/display/renderer.tsx
+++ b/src/display/renderer.tsx
@@ -10,7 +10,7 @@ import React from "react";
 import PropTypes, { InferType } from "prop-types";
 import SpriteText from "three-spritetext";
 import { Object3D, Sprite } from "three";
-import Graph, { Coordinate, LinkData, NodeData } from "./graph";
+import Graph, { Coordinate, LinkData, NodeData } from "../common/graph";
 
 export interface GraphNode extends NodeData {
     x: number;
diff --git a/src/editor/js/editor.js b/src/editor/js/editor.js
index c45f59c2d835642f4606aed087da4aec7c019fe0..f5fb7c36b771c541948c439af949af6388281db3 100644
--- a/src/editor/js/editor.js
+++ b/src/editor/js/editor.js
@@ -1,6 +1,6 @@
 import { State } from "./state";
 import * as Graph from "./graph";
-import { loadGraphJson } from "../../datasets";
+import { loadGraphJson } from "../../common/datasets";
 import ForceGraph from "force-graph";
 import * as Interactions from "./interactions";
 import { setSpace, SPACE } from "../../config";
diff --git a/src/editor/js/interactions.js b/src/editor/js/interactions.js
index 1f7f1bf117942dbaa79aed56869441841ab0dd10..c0fafe298d585d3ef1f8df0ea526eb7b4437dca2 100644
--- a/src/editor/js/interactions.js
+++ b/src/editor/js/interactions.js
@@ -1,6 +1,6 @@
 import jQuery from "jquery";
 import { state } from "./editor";
-import { listAllSpaces, saveGraphJson } from "../../datasets";
+import { listAllSpaces, saveGraphJson } from "../../common/datasets";
 import { SPACE } from "../../config";
 
 /**
diff --git a/src/editor/js/tools/savetool.js b/src/editor/js/tools/savetool.js
index fa1c1eed2be376b9e940e5711bad0a8433de5270..124f6bc9b8da60635dad602439a96d974b5473be 100644
--- a/src/editor/js/tools/savetool.js
+++ b/src/editor/js/tools/savetool.js
@@ -1,5 +1,5 @@
 import Tool from "./tool";
-import { saveGraphJson } from "../../../datasets";
+import { saveGraphJson } from "../../../common/datasets";
 import { state, graph } from "../editor";
 import { SPACE } from "../../../config";
 import SaveIcon from "../../images/tools/save.png";