diff --git a/README.md b/README.md
index 7b99f601f6986b9e61f9897f7771bfc2b980f7a4..39dc14f6d2ca15d1ae633fda4bb5f1d22bfb5441 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ This is the query-conversion package. It holds the code that translates the JSON
 
 ## Creating a new converter
 ```go
-import "git.science.uu.nl/datastrophe/query-conversion"
+import "git.science.uu.nl/GraphPolaris/query-conversion"
 
 queryservice := cypher.NewService()
 ```
@@ -17,7 +17,7 @@ query, err := queryservice.ConvertQuery(JSONquery)
 
 ## Creating a mock converter
 ```go
-import "git.science.uu.nl/datastrophe/query-conversion"
+import "git.science.uu.nl/GraphPolaris/query-conversion"
 
 mockService := NewMockService()
 ```
\ No newline at end of file
diff --git a/aql/convertQuery.go b/aql/convertQuery.go
index bc15ba79fec8dcc1ee18f6b4d4a915cd9ed6fab0..66ec9adffc7f3c0ac78d7beea44943307c808b3d 100644
--- a/aql/convertQuery.go
+++ b/aql/convertQuery.go
@@ -9,7 +9,7 @@ import (
 	"errors"
 	"fmt"
 
-	"git.science.uu.nl/datastrophe/query-conversion/entity"
+	"git.science.uu.nl/GraphPolaris/query-conversion/entity"
 )
 
 // Version 1.13
diff --git a/aql/convertQueryBenchmark_test.go b/aql/convertQueryBenchmark_test.go
index 2506fe36b12162bc8e9d2b9f577be8896d3ee83a..82768fe2d3f5ed9018f3cefaf6c30b474bc50bee 100644
--- a/aql/convertQueryBenchmark_test.go
+++ b/aql/convertQueryBenchmark_test.go
@@ -9,7 +9,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"git.science.uu.nl/datastrophe/query-conversion/entity"
+	"git.science.uu.nl/GraphPolaris/query-conversion/entity"
 )
 
 /*
diff --git a/aql/convertQuery_test.go b/aql/convertQuery_test.go
index f083a12123332994a623938178fdd1c973e02887..8d2c843372845cdb5e802ff233802818148131ed 100644
--- a/aql/convertQuery_test.go
+++ b/aql/convertQuery_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"git.science.uu.nl/datastrophe/query-conversion/entity"
+	"git.science.uu.nl/GraphPolaris/query-conversion/entity"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/aql/createConstraints.go b/aql/createConstraints.go
index 0a6c8ed08fca24bbe593323320a6b7b505fcb605..9b7e8e21dedd5b8a6acbe4058c5e4499eb31bf20 100644
--- a/aql/createConstraints.go
+++ b/aql/createConstraints.go
@@ -3,7 +3,7 @@ package aql
 import (
 	"fmt"
 
-	"git.science.uu.nl/datastrophe/query-conversion/entity"
+	"git.science.uu.nl/GraphPolaris/query-conversion/entity"
 )
 
 /* createConstraintStatements generates the appropriate amount of constraint lines calling createConstraingBoolExpression
diff --git a/aql/debug.test b/aql/debug.test
deleted file mode 100644
index 934cd9a89adf48e864e89ee0528ad2681abfaa01..0000000000000000000000000000000000000000
Binary files a/aql/debug.test and /dev/null differ
diff --git a/aql/mockConvertQuery.go b/aql/mockConvertQuery.go
index 5f82c691a8cc7477ca6faecb09e7c644f684d295..22fc35a13915165999f0d16298275e07d6964a7a 100644
--- a/aql/mockConvertQuery.go
+++ b/aql/mockConvertQuery.go
@@ -8,7 +8,7 @@ package aql
 import (
 	"errors"
 
-	"git.science.uu.nl/datastrophe/query-conversion/entity"
+	"git.science.uu.nl/GraphPolaris/query-conversion/entity"
 )
 
 /*
diff --git a/cypher/convertQuery.go b/cypher/convertQuery.go
index 3a89ec88c6b66c76c5fe716180db9247d8ac8715..b8efc8ffb050fafa29b807d0d9d609bc1168c4f1 100644
--- a/cypher/convertQuery.go
+++ b/cypher/convertQuery.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"strings"
 
-	"git.science.uu.nl/datastrophe/query-conversion/entity"
+	"git.science.uu.nl/GraphPolaris/query-conversion/entity"
 )
 
 /*
diff --git a/cypher/convertQueryBenchmark_test.go b/cypher/convertQueryBenchmark_test.go
index 3794ab92a7434af21c8fcc34fb640a6d1d789f3a..a7f72267de4f12db039c2d9c854ff8f2c08dc9ad 100644
--- a/cypher/convertQueryBenchmark_test.go
+++ b/cypher/convertQueryBenchmark_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"git.science.uu.nl/datastrophe/query-conversion/entity"
+	"git.science.uu.nl/GraphPolaris/query-conversion/entity"
 )
 
 func BenchmarkConvertEmptyQuery(b *testing.B) {
diff --git a/cypher/convertQuery_test.go b/cypher/convertQuery_test.go
index c07a06556a6e16f92d52ffae50e7de21d0d75a70..13b66cb76cca72241d6e3df69d6e2650531f6010 100644
--- a/cypher/convertQuery_test.go
+++ b/cypher/convertQuery_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"git.science.uu.nl/datastrophe/query-conversion/entity"
+	"git.science.uu.nl/GraphPolaris/query-conversion/entity"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/cypher/createConstraints.go b/cypher/createConstraints.go
index b24d895f7c9afbccd519bc4c6ec3c9fecd89de9a..9cc59fcc3de7c1eb831ceaa1cb42681d12f173cd 100644
--- a/cypher/createConstraints.go
+++ b/cypher/createConstraints.go
@@ -3,7 +3,7 @@ package cypher
 import (
 	"fmt"
 
-	"git.science.uu.nl/datastrophe/query-conversion/entity"
+	"git.science.uu.nl/GraphPolaris/query-conversion/entity"
 )
 
 /* createConstraintStatements generates the appropriate amount of constraint lines calling createConstraingBoolExpression
diff --git a/interface.go b/interface.go
index 3010a43207c4b0e676295e2cb7ac6bcec46a8512..baeeee88d4ac22380815a0ddcf5477dbb8dd296e 100644
--- a/interface.go
+++ b/interface.go
@@ -1,6 +1,6 @@
 package query
 
-import "git.science.uu.nl/datastrophe/query-conversion/entity"
+import "git.science.uu.nl/GraphPolaris/query-conversion/entity"
 
 // A Converter converts an incoming message in our JSON format to a format like AQL or Cypher
 type Converter interface {
diff --git a/main/main.go b/main/main.go
index 204395ac15bd59e116505e1e9185e193bee4f0f0..718419d1588a286596c1bbdd46158c2a59dc064c 100644
--- a/main/main.go
+++ b/main/main.go
@@ -9,8 +9,8 @@ import (
 	"encoding/json"
 	"log"
 
-	"git.science.uu.nl/datastrophe/query-conversion/aql"
-	"git.science.uu.nl/datastrophe/query-conversion/entity"
+	"git.science.uu.nl/GraphPolaris/query-conversion/aql"
+	"git.science.uu.nl/GraphPolaris/query-conversion/entity"
 )
 
 /*
diff --git a/main/node_modules/.yarn-integrity b/main/node_modules/.yarn-integrity
deleted file mode 100644
index 1a3aded6105fb67caa747e15081dd1543f4cb74b..0000000000000000000000000000000000000000
--- a/main/node_modules/.yarn-integrity
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "systemParams": "win32-x64-72",
-  "modulesFolders": [],
-  "flags": [],
-  "linkedModules": [],
-  "topLevelPatterns": [],
-  "lockfileEntries": {},
-  "files": [],
-  "artifacts": {}
-}
\ No newline at end of file
diff --git a/main/yarn.lock b/main/yarn.lock
deleted file mode 100644
index fb57ccd13afbd082ad82051c2ffebef4840661ec..0000000000000000000000000000000000000000
--- a/main/yarn.lock
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
diff --git a/unmarshalJSON.go b/unmarshalJSON.go
index 0cac26fd2b8ccd58672e491338654ad54f0cb9a2..70fe17778b00cf6c7950c236f29245759c868fd7 100644
--- a/unmarshalJSON.go
+++ b/unmarshalJSON.go
@@ -3,7 +3,7 @@ package query
 import (
 	"encoding/json"
 
-	"git.science.uu.nl/datastrophe/query-conversion/entity"
+	"git.science.uu.nl/GraphPolaris/query-conversion/entity"
 )
 
 /*