diff --git a/convertQuery.go b/aql/convertQuery.go
similarity index 99%
rename from convertQuery.go
rename to aql/convertQuery.go
index 4c5420a7525aabef852f3c1ea4a0e179ccbad3d8..8ef1db00b794cfebb23e2a2aad61fd631bd2d823 100644
--- a/convertQuery.go
+++ b/aql/convertQuery.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"git.science.uu.nl/datastrophe/aql-conversion/entity"
+	"git.science.uu.nl/datastrophe/query-conversion/aql/entity"
 )
 
 /*
diff --git a/convertQueryBenchmark_test.go b/aql/convertQueryBenchmark_test.go
similarity index 100%
rename from convertQueryBenchmark_test.go
rename to aql/convertQueryBenchmark_test.go
diff --git a/convertQuery_test.go b/aql/convertQuery_test.go
similarity index 100%
rename from convertQuery_test.go
rename to aql/convertQuery_test.go
diff --git a/createConstraints.go b/aql/createConstraints.go
similarity index 97%
rename from createConstraints.go
rename to aql/createConstraints.go
index abe8035f0045fbf19acc5a65aacb067b9c731cd0..74511d54154a9e7ee0d1f564ff84dcaf20749cfa 100644
--- a/createConstraints.go
+++ b/aql/createConstraints.go
@@ -3,7 +3,7 @@ package aql
 import (
 	"fmt"
 
-	"git.science.uu.nl/datastrophe/aql-conversion/entity"
+	"git.science.uu.nl/datastrophe/query-conversion/aql/entity"
 )
 
 /* createConstraintStatements generates the appropriate amount of constraint lines calling createConstraingBoolExpression
diff --git a/entity/queryStruct.go b/aql/entity/queryStruct.go
similarity index 100%
rename from entity/queryStruct.go
rename to aql/entity/queryStruct.go
diff --git a/mockConvertQuery.go b/aql/mockConvertQuery.go
similarity index 100%
rename from mockConvertQuery.go
rename to aql/mockConvertQuery.go
diff --git a/queryConverter.go b/aql/queryConverter.go
similarity index 100%
rename from queryConverter.go
rename to aql/queryConverter.go
diff --git a/go.mod b/go.mod
index 3a61254e0f4386dd9bb3bfb5c501a27bd42afac0..928390fa583a1088a3fb71b1c6010eeb7bbcce37 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module git.science.uu.nl/datastrophe/aql-conversion
+module git.science.uu.nl/datastrophe/query-conversion
 
 go 1.16
 
diff --git a/go.sum b/go.sum
index b380ae44575c322793da20d51d562f1d8aef1b1d..acb88a48f6840e3603bba5b148411d5091145edb 100644
--- a/go.sum
+++ b/go.sum
@@ -5,6 +5,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=