diff --git a/src/routes/[course]/[link]/+page.server.ts b/src/routes/[course]/[link]/+page.server.ts
deleted file mode 100644
index 41d88af..0000000
--- a/src/routes/[course]/[link]/+page.server.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-
-// External imports
-import prisma from '$lib/server/prisma'
-
-// Internal imports
-import { GraphHelper } from '$scripts/helpers'
-
-// Load
-export const load = async ({ params }) => {
-	const graphId = 1 // TODO replace with actual graph id, once we have a way to get it
-
-	const graph = await GraphHelper.toDTO(
-		(await prisma.graph.findUnique({
-			where: { id: graphId }
-		}))!
-	)
-
-	return { graph }
-}
diff --git a/src/routes/[course]/[link]/+page.svelte b/src/routes/[course]/[link]/+page.svelte
deleted file mode 100644
index 50196d1..0000000
--- a/src/routes/[course]/[link]/+page.svelte
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<script lang="ts">
-
-	// Components
-	import GraphSVG from '$components/GraphSVG.svelte'
-
-</script>
-
-
-<!-- Markup -->
-
-
-<GraphSVG interactive={false} />
\ No newline at end of file
diff --git a/src/routes/[course]/[link]/+page.ts b/src/routes/[course]/[link]/+page.ts
deleted file mode 100644
index d7f4a11..0000000
--- a/src/routes/[course]/[link]/+page.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-
-// Svelte imports
-import type { PageLoad } from './$types'
-
-// Internal imports
-import { Graph } from '$scripts/entities'
-import { graph } from '$stores'
-
-// load
-export const load: PageLoad = ({ data }) => {
-	graph.set(Graph.revive(data.graph))
-}
\ No newline at end of file
diff --git a/src/routes/app/course/[course]/overview/GraphRow.svelte b/src/routes/app/course/[course]/overview/GraphRow.svelte
index 5a50a54..553bdc4 100644
--- a/src/routes/app/course/[course]/overview/GraphRow.svelte
+++ b/src/routes/app/course/[course]/overview/GraphRow.svelte
@@ -90,7 +90,7 @@
 	<IconButton scale
 		src={pencilIcon}
 		description="Edit Graph"
-		href="/app/course/{course.id}/graph/{graph.id}/settings"
+		href="/app/graph/{graph.id}/settings"
 	/>
 
 	<IconButton scale 
diff --git a/src/routes/app/course/[course]/graph/[graph]/+page.ts b/src/routes/app/graph/[graph]/+page.ts
similarity index 100%
rename from src/routes/app/course/[course]/graph/[graph]/+page.ts
rename to src/routes/app/graph/[graph]/+page.ts
diff --git a/src/routes/app/course/[course]/graph/[graph]/layout/+page.server.ts b/src/routes/app/graph/[graph]/layout/+page.server.ts
similarity index 100%
rename from src/routes/app/course/[course]/graph/[graph]/layout/+page.server.ts
rename to src/routes/app/graph/[graph]/layout/+page.server.ts
diff --git a/src/routes/app/course/[course]/graph/[graph]/layout/+page.svelte b/src/routes/app/graph/[graph]/layout/+page.svelte
similarity index 90%
rename from src/routes/app/course/[course]/graph/[graph]/layout/+page.svelte
rename to src/routes/app/graph/[graph]/layout/+page.svelte
index 1cbff1b..02472c6 100644
--- a/src/routes/app/course/[course]/graph/[graph]/layout/+page.svelte
+++ b/src/routes/app/graph/[graph]/layout/+page.svelte
@@ -44,11 +44,11 @@
 		},
 		{
 			name: $graph.name,
-			href: `/app/course/${$course.code}/graph/${$graph.id}/overview`
+			href: `/app/graph/${$graph.id}/overview`
 		},
 		{
 			name: "Edit",
-			href: `/app/course/${$course.code}/graph/${$graph.id}/edit`
+			href: `/app/graph/${$graph.id}/edit`
 		}
 	]}
 >
@@ -72,7 +72,7 @@
 
 		<div class="flex-spacer" />
 
-		<Button href="/app/course/{$course.code}/graph/{$graph.id}/settings"> Edit fields & relations </Button>
+		<Button href="/app/graph/{$graph.id}/settings"> Edit fields & relations </Button>
 	</svelte:fragment>
 
 	<div class="editor">
diff --git a/src/routes/app/course/[course]/graph/[graph]/layout/+page.ts b/src/routes/app/graph/[graph]/layout/+page.ts
similarity index 100%
rename from src/routes/app/course/[course]/graph/[graph]/layout/+page.ts
rename to src/routes/app/graph/[graph]/layout/+page.ts
diff --git a/src/routes/app/course/[course]/graph/[graph]/settings/+page.server.ts b/src/routes/app/graph/[graph]/settings/+page.server.ts
similarity index 100%
rename from src/routes/app/course/[course]/graph/[graph]/settings/+page.server.ts
rename to src/routes/app/graph/[graph]/settings/+page.server.ts
diff --git a/src/routes/app/course/[course]/graph/[graph]/settings/+page.svelte b/src/routes/app/graph/[graph]/settings/+page.svelte
similarity index 88%
rename from src/routes/app/course/[course]/graph/[graph]/settings/+page.svelte
rename to src/routes/app/graph/[graph]/settings/+page.svelte
index 90554e1..53a673e 100644
--- a/src/routes/app/course/[course]/graph/[graph]/settings/+page.svelte
+++ b/src/routes/app/graph/[graph]/settings/+page.svelte
@@ -37,11 +37,11 @@
 		},
 		{
 			name: $graph.name,
-			href: `/app/course/${$course.id}/graph/${$graph.id}/overview`
+			href: `/app/graph/${$graph.id}/overview`
 		},
 		{
 			name: 'Settings',
-			href: `/app/course/${$course.id}/graph/${$graph.id}/settings`
+			href: `/app/graph/${$graph.id}/settings`
 		}
 	]}
 >
@@ -60,7 +60,7 @@
 
 		<div class="flex-spacer" />
 
-		<Button href="/app/course/{$course.id}/graph/{$graph.id}/layout"> Edit layout </Button>
+		<Button href="/app/graph/{$graph.id}/layout"> Edit layout </Button>
 	</svelte:fragment>
 
 	<Tabular tabs={[
diff --git a/src/routes/app/course/[course]/graph/[graph]/settings/+page.ts b/src/routes/app/graph/[graph]/settings/+page.ts
similarity index 100%
rename from src/routes/app/course/[course]/graph/[graph]/settings/+page.ts
rename to src/routes/app/graph/[graph]/settings/+page.ts
diff --git a/src/routes/app/course/[course]/graph/[graph]/settings/DomainRow.svelte b/src/routes/app/graph/[graph]/settings/DomainRow.svelte
similarity index 100%
rename from src/routes/app/course/[course]/graph/[graph]/settings/DomainRow.svelte
rename to src/routes/app/graph/[graph]/settings/DomainRow.svelte
diff --git a/src/routes/app/course/[course]/graph/[graph]/settings/DomainSettings.svelte b/src/routes/app/graph/[graph]/settings/DomainSettings.svelte
similarity index 100%
rename from src/routes/app/course/[course]/graph/[graph]/settings/DomainSettings.svelte
rename to src/routes/app/graph/[graph]/settings/DomainSettings.svelte
diff --git a/src/routes/app/course/[course]/graph/[graph]/settings/GeneralSettings.svelte b/src/routes/app/graph/[graph]/settings/GeneralSettings.svelte
similarity index 100%
rename from src/routes/app/course/[course]/graph/[graph]/settings/GeneralSettings.svelte
rename to src/routes/app/graph/[graph]/settings/GeneralSettings.svelte
diff --git a/src/routes/app/course/[course]/graph/[graph]/settings/LectureSettings.svelte b/src/routes/app/graph/[graph]/settings/LectureSettings.svelte
similarity index 100%
rename from src/routes/app/course/[course]/graph/[graph]/settings/LectureSettings.svelte
rename to src/routes/app/graph/[graph]/settings/LectureSettings.svelte
diff --git a/src/routes/app/course/[course]/graph/[graph]/settings/OLD_DomainSettings.svelte b/src/routes/app/graph/[graph]/settings/OLD_DomainSettings.svelte
similarity index 100%
rename from src/routes/app/course/[course]/graph/[graph]/settings/OLD_DomainSettings.svelte
rename to src/routes/app/graph/[graph]/settings/OLD_DomainSettings.svelte
diff --git a/src/routes/app/course/[course]/graph/[graph]/settings/SubjectSettings.svelte b/src/routes/app/graph/[graph]/settings/SubjectSettings.svelte
similarity index 100%
rename from src/routes/app/course/[course]/graph/[graph]/settings/SubjectSettings.svelte
rename to src/routes/app/graph/[graph]/settings/SubjectSettings.svelte