diff --git a/aql/convertQuery.go b/aql/convertQuery.go
index 0fe8f7484eeedcc37fdbc1f720848c14051e8df4..1e6c635e7742acf5e62a7be420c6d0897a789953 100644
--- a/aql/convertQuery.go
+++ b/aql/convertQuery.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"git.science.uu.nl/datastrophe/query-conversion/aql/entity"
+	"git.science.uu.nl/datastrophe/query-conversion/entity"
 )
 
 /*
diff --git a/aql/convertQueryBenchmark_test.go b/aql/convertQueryBenchmark_test.go
index ed4aef11a496ec326ebe8264534c52a671e6864b..b1ba7b7b6537c0a9ce571c60e5698b73967fa223 100644
--- a/aql/convertQueryBenchmark_test.go
+++ b/aql/convertQueryBenchmark_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"git.science.uu.nl/datastrophe/query-conversion/aql/entity"
+	"git.science.uu.nl/datastrophe/query-conversion/entity"
 )
 
 func BenchmarkConvertEmptyQuery(b *testing.B) {
diff --git a/aql/convertQuery_test.go b/aql/convertQuery_test.go
index bf8dcbe908ea1f33c84d789d1c5f93b32fad389d..6d5a72a1d19fcfe87d4c0f614c86e5cfcff7aeeb 100644
--- a/aql/convertQuery_test.go
+++ b/aql/convertQuery_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"git.science.uu.nl/datastrophe/query-conversion/aql/entity"
+	"git.science.uu.nl/datastrophe/query-conversion/entity"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/aql/createConstraints.go b/aql/createConstraints.go
index 74511d54154a9e7ee0d1f564ff84dcaf20749cfa..cdc9891d56705ae75fbac1d28b96a95eac7799d6 100644
--- a/aql/createConstraints.go
+++ b/aql/createConstraints.go
@@ -3,7 +3,7 @@ package aql
 import (
 	"fmt"
 
-	"git.science.uu.nl/datastrophe/query-conversion/aql/entity"
+	"git.science.uu.nl/datastrophe/query-conversion/entity"
 )
 
 /* createConstraintStatements generates the appropriate amount of constraint lines calling createConstraingBoolExpression
diff --git a/aql/entity/queryStruct.go b/entity/queryStruct.go
similarity index 100%
rename from aql/entity/queryStruct.go
rename to entity/queryStruct.go
diff --git a/interface.go b/interface.go
index 5818f30299af54613a915835df8de332963e2239..3010a43207c4b0e676295e2cb7ac6bcec46a8512 100644
--- a/interface.go
+++ b/interface.go
@@ -1,6 +1,6 @@
 package query
 
-import "git.science.uu.nl/datastrophe/query-conversion/aql/entity"
+import "git.science.uu.nl/datastrophe/query-conversion/entity"
 
 // A Converter converts an incoming message in our JSON format to a format like AQL or Cypher
 type Converter interface {