diff --git a/src/main/java/de/ids_mannheim/korap/query/elements/Scope.java b/src/main/java/de/ids_mannheim/korap/query/elements/Scope.java
deleted file mode 100644
index 02cc60f..0000000
--- a/src/main/java/de/ids_mannheim/korap/query/elements/Scope.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.ids_mannheim.korap.query.elements;
-
-public enum Scope {
-    SENTENCE("s"), PARAGRAPH("p"), TEXT("t");
-    String value;
-
-    Scope (String value) {
-        this.value = value;
-    }
-
-    @Override
-    public String toString() {
-        return value;
-    }
-}
diff --git a/src/main/java/de/ids_mannheim/korap/query/elements/KoralGroup.java b/src/main/java/de/ids_mannheim/korap/query/object/KoralGroup.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/query/elements/KoralGroup.java
rename to src/main/java/de/ids_mannheim/korap/query/object/KoralGroup.java
diff --git a/src/main/java/de/ids_mannheim/korap/query/elements/MatchOperator.java b/src/main/java/de/ids_mannheim/korap/query/object/KoralMatchOperator.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/query/elements/MatchOperator.java
rename to src/main/java/de/ids_mannheim/korap/query/object/KoralMatchOperator.java
diff --git a/src/main/java/de/ids_mannheim/korap/query/elements/Element.java b/src/main/java/de/ids_mannheim/korap/query/object/KoralObject.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/query/elements/Element.java
rename to src/main/java/de/ids_mannheim/korap/query/object/KoralObject.java
diff --git a/src/main/java/de/ids_mannheim/korap/query/elements/KoralOperation.java b/src/main/java/de/ids_mannheim/korap/query/object/KoralOperation.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/query/elements/KoralOperation.java
rename to src/main/java/de/ids_mannheim/korap/query/object/KoralOperation.java
diff --git a/src/main/java/de/ids_mannheim/korap/query/elements/KoralRelation.java b/src/main/java/de/ids_mannheim/korap/query/object/KoralRelation.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/query/elements/KoralRelation.java
rename to src/main/java/de/ids_mannheim/korap/query/object/KoralRelation.java
diff --git a/src/main/java/de/ids_mannheim/korap/query/elements/KoralSpan.java b/src/main/java/de/ids_mannheim/korap/query/object/KoralSpan.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/query/elements/KoralSpan.java
rename to src/main/java/de/ids_mannheim/korap/query/object/KoralSpan.java
diff --git a/src/main/java/de/ids_mannheim/korap/query/elements/KoralTerm.java b/src/main/java/de/ids_mannheim/korap/query/object/KoralTerm.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/query/elements/KoralTerm.java
rename to src/main/java/de/ids_mannheim/korap/query/object/KoralTerm.java
diff --git a/src/main/java/de/ids_mannheim/korap/query/elements/KoralTermGroup.java b/src/main/java/de/ids_mannheim/korap/query/object/KoralTermGroup.java
similarity index 92%
rename from src/main/java/de/ids_mannheim/korap/query/elements/KoralTermGroup.java
rename to src/main/java/de/ids_mannheim/korap/query/object/KoralTermGroup.java
index 54515fd..96dac7f 100644
--- a/src/main/java/de/ids_mannheim/korap/query/elements/KoralTermGroup.java
+++ b/src/main/java/de/ids_mannheim/korap/query/object/KoralTermGroup.java
@@ -7,6 +7,7 @@
 
 import de.ids_mannheim.korap.query.parse.fcsql.ExpressionParser;
 import de.ids_mannheim.korap.query.serialize.MapBuilder;
+import de.ids_mannheim.korap.query.serialize.util.KoralException;
 import eu.clarin.sru.server.fcs.parser.QueryNode;
 
 /**
@@ -25,7 +26,7 @@
     }
 
     public KoralTermGroup (ExpressionParser parser, KoralRelation relation,
-            List<QueryNode> nodes) {
+            List<QueryNode> nodes) throws KoralException {
         this.relation = relation.toString();
         for (QueryNode node : nodes) {
             operands.add(parser.parseExpression(node, false, false));
diff --git a/src/main/java/de/ids_mannheim/korap/query/elements/KoralToken.java b/src/main/java/de/ids_mannheim/korap/query/object/KoralToken.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/query/elements/KoralToken.java
rename to src/main/java/de/ids_mannheim/korap/query/object/KoralToken.java
diff --git a/src/main/java/de/ids_mannheim/korap/query/elements/KoralType.java b/src/main/java/de/ids_mannheim/korap/query/object/KoralType.java
similarity index 100%
rename from src/main/java/de/ids_mannheim/korap/query/elements/KoralType.java
rename to src/main/java/de/ids_mannheim/korap/query/object/KoralType.java